Hive tests with Byzantine

8 files changed, 1570 insertions, 484 deletions

diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
index 21662dec7..cc4abf02e 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01de91",
-                    "hash" : "0xad67889809494a5a1e1f0a0543f56f7171038ddbb9809cba03cc2bed61a03d20",
-                    "mixHash" : "0x6e66fbbf1daf7eb7cfaf121826f4a9593db04e0c1dd273e17778c56158a53ef7",
-                    "nonce" : "0x0b8e16b315d70078",
+                    "hash" : "0x6d46618bff87de28e46a91a81af5e9f91e152bca0912cbf22e53e5af95ee54ec",
+                    "mixHash" : "0x33b65e5f2ddb569a7bc1466d55abd001d17f5f281f34d5ddbdc3780af6c1303f",
+                    "nonce" : "0xa55fbd3e3c2b58db",
                     "number" : "0x01",
                     "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
-                    "receiptTrie" : "0xd9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446",
-                    "stateRoot" : "0xadf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1",
+                    "receiptTrie" : "0xaa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdb",
+                    "stateRoot" : "0x3d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0adf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a06e66fbbf1daf7eb7cfaf121826f4a9593db04e0c1dd273e17778c56158a53ef7880b8e16b315d70078f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0aa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a033b65e5f2ddb569a7bc1466d55abd001d17f5f281f34d5ddbdc3780af6c1303f88a55fbd3e3c2b58dbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad67889809494a5a1e1f0a0543f56f7171038ddbb9809cba03cc2bed61a03d20",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6d46618bff87de28e46a91a81af5e9f91e152bca0912cbf22e53e5af95ee54ec",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
@@ -123,10 +130,10 @@
             }
         }
     },
-    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -138,9 +145,140 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01de91",
-                    "hash" : "0x2e4f24209ec02fffe4f0d171103d6859ff197436bfcd4743bdf80c7182969015",
-                    "mixHash" : "0xa5488358a08d20e1eb3fb295f58929b6c0218788926e9e483dc42c4ccb78c6ed",
-                    "nonce" : "0xaf43fff2d693089b",
+                    "hash" : "0x632459f5a67b388b2db954d7989bb5bdb5c61a38f144081227aec322a377ca15",
+                    "mixHash" : "0x9ebb1c74f78515d699ffd7e5fc5a7936e047615e61258ebf0f71c8cd8cc48d53",
+                    "nonce" : "0x5ebce396edfdf1f0",
+                    "number" : "0x01",
+                    "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
+                    "receiptTrie" : "0xaa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdb",
+                    "stateRoot" : "0x3d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0aa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a09ebb1c74f78515d699ffd7e5fc5a7936e047615e61258ebf0f71c8cd8cc48d53885ebce396edfdf1f0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x632459f5a67b388b2db954d7989bb5bdb5c61a38f144081227aec322a377ca15",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000103" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5de91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3316f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01",
+                    "0x0a" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000103" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01de91",
+                    "hash" : "0x4fe26fa5ab678d4cfe747a8719135b9b1a8bca00f26a0fb6f0ad21bdbf849d8c",
+                    "mixHash" : "0xd9424a0894626db604663eced2d2c012ab436e3f25baac6b3a9ff85deb13a82d",
+                    "nonce" : "0x728b575f19bed5f7",
                     "number" : "0x01",
                     "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
                     "receiptTrie" : "0xd9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446",
@@ -149,7 +287,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0adf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a0a5488358a08d20e1eb3fb295f58929b6c0218788926e9e483dc42c4ccb78c6ed88af43fff2d693089bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0adf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a0d9424a0894626db604663eced2d2c012ab436e3f25baac6b3a9ff85deb13a82d88728b575f19bed5f7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -186,8 +324,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e4f24209ec02fffe4f0d171103d6859ff197436bfcd4743bdf80c7182969015",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4fe26fa5ab678d4cfe747a8719135b9b1a8bca00f26a0fb6f0ad21bdbf849d8c",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
@@ -247,10 +385,10 @@
             }
         }
     },
-    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -261,19 +399,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x1c8a292c3a0dcdda20ee76b567cc98dd16c5ab9777c78e3aee8c9eae221a158f",
-                    "mixHash" : "0x8b9f27582af50859eb439da05ecfb00cdcbb2ae113c75d64b5da17d1512c14e7",
-                    "nonce" : "0x8ea651689d0381e6",
+                    "gasUsed" : "0x01de91",
+                    "hash" : "0xad0936d737796b0a8a5578c07a9d33ab1942c50096ff668f11c41bcaf02af1fa",
+                    "mixHash" : "0xeaf81a598aeea464984bea41a2a4487cb950af551dab75f167c9589ad82a7ddd",
+                    "nonce" : "0xe6570307300066f1",
                     "number" : "0x01",
                     "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
-                    "receiptTrie" : "0x72ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3",
-                    "stateRoot" : "0xeeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9",
+                    "receiptTrie" : "0xd9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446",
+                    "stateRoot" : "0xadf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a072ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a08b9f27582af50859eb439da05ecfb00cdcbb2ae113c75d64b5da17d1512c14e7888ea651689d0381e6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0adf334c283e6bc915bf24fff7809672ed80db4590a1e2fadc0fe1689954966d1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d9171028e999e6690315d6d7a53f5d69a71786ffd5afd8836d020539e434c446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a0eaf81a598aeea464984bea41a2a4487cb950af551dab75f167c9589ad82a7ddd88e6570307300066f1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -310,25 +448,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c8a292c3a0dcdda20ee76b567cc98dd16c5ab9777c78e3aee8c9eae221a158f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xad0936d737796b0a8a5578c07a9d33ab1942c50096ff668f11c41bcaf02af1fa",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x12"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
+                "balance" : "0x4563918244f5de91",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49be840",
+                "balance" : "0xe8d4a3316f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -339,6 +478,10 @@
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01",
+                    "0x0a" : "0x01"
                 }
             }
         },
@@ -366,10 +509,10 @@
             }
         }
     },
-    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -381,9 +524,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "0xa5936866802ca8094ada5671c838efd07ce0859fd11f2e1f9de7ad6c0d3979bb",
-                    "mixHash" : "0x2ef9c83c0b386d2a4008f54442d2b46683f13cd57dd73ad280cf04a8e2231ec3",
-                    "nonce" : "0x0f6862bd86e36395",
+                    "hash" : "0xeb095911d7a8b9e8c603e76992e6634e72aa8d9267ad15d2950979142a2fa562",
+                    "mixHash" : "0x5c299d8016bc263b6176da8f0b6279574bf06088f37954cbaf452ede71a95875",
+                    "nonce" : "0x266b0d44ba458edd",
                     "number" : "0x01",
                     "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
                     "receiptTrie" : "0x72ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3",
@@ -392,7 +535,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a072ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a02ef9c83c0b386d2a4008f54442d2b46683f13cd57dd73ad280cf04a8e2231ec3880f6862bd86e36395f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a072ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a05c299d8016bc263b6176da8f0b6279574bf06088f37954cbaf452ede71a9587588266b0d44ba458eddf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,8 +572,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5936866802ca8094ada5671c838efd07ce0859fd11f2e1f9de7ad6c0d3979bb",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeb095911d7a8b9e8c603e76992e6634e72aa8d9267ad15d2950979142a2fa562",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
@@ -485,10 +628,10 @@
             }
         }
     },
-    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -499,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01de91",
-                    "hash" : "0x6616f38bebb7c43ab6b282c5db535cf14b2694c57300c661e5a776003cd81358",
-                    "mixHash" : "0xd8328c3a01731d0d107a5c2e62d70a03dcebede3a0df1658a3b8f9af6570f316",
-                    "nonce" : "0x30cc68c5c040217c",
+                    "gasUsed" : "0x0927c0",
+                    "hash" : "0x764a38570047c151cfc02c33391fae7fbc3caf150d232b89e7fea977ae303c55",
+                    "mixHash" : "0xcbfe14bbe1de9ed9dbe78241da7263172297044f696decf8b86286df2addbf23",
+                    "nonce" : "0x41d0a24810cfc10b",
                     "number" : "0x01",
                     "parentHash" : "0x4fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101d",
-                    "receiptTrie" : "0xaa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdb",
-                    "stateRoot" : "0x3d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661c",
+                    "receiptTrie" : "0x72ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3",
+                    "stateRoot" : "0xeeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d3123b81bc20da1bd13a02808b8e1740a8be31ba76b8e69e1baa9b4cdff661ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0aa48ef1b09d640e334e853ee51e7368e5e787028af88ba78d4709fcabbe3ecdbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301de918203e880a0d8328c3a01731d0d107a5c2e62d70a03dcebede3a0df1658a3b8f9af6570f3168830cc68c5c040217cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a04fb1efb319cb45e711b95818c43953f9a4cbd6552006992ece7a7b59eab5101da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eeebe512f3629d3127ccca035ef0e61cf4408b8f257556967d43a52dbffdf7b9a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a072ff5397ce4eaaae80b12085c4220213244a0f1e19d091edb0c77a6c19676cc3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0cbfe14bbe1de9ed9dbe78241da7263172297044f696decf8b86286df2addbf238841d0a24810cfc10bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -548,33 +691,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b7c513c8b8578c6d742a85e8905f0718b4428727379f1598084b5679f5a0e59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6616f38bebb7c43ab6b282c5db535cf14b2694c57300c661e5a776003cd81358",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x764a38570047c151cfc02c33391fae7fbc3caf150d232b89e7fea977ae303c55",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x12"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5de91",
+                "balance" : "0x4563918244fd27c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3316f",
+                "balance" : "0xe8d49be840",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -585,10 +720,6 @@
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x12",
-                    "0x08" : "0x08d5b6",
-                    "0x09" : "0x01",
-                    "0x0a" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0.json
index 34a7efe74..b0d789418 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01debf",
-                    "hash" : "0xaa4f8bf73276cb9f1deced6f3f7ae520fc3611bc39f795f886c45cf36ab45a17",
-                    "mixHash" : "0x7ddbc8ca0e4b50ec7f3b6b8ca35bb52121c783581257527d0671f57ebc6af7cf",
-                    "nonce" : "0x475d53d439fe5b7a",
+                    "hash" : "0x526b32f05ed702810894223869ac47cd26ed42556bda5cd0ea06b7ed3c04c944",
+                    "mixHash" : "0x0549c38e2a2ff4f5a86d12dd3468965fc4ecdab8f7958caf2579c88a512cc3aa",
+                    "nonce" : "0xd63cfdbe3dede752",
                     "number" : "0x01",
                     "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
-                    "receiptTrie" : "0xd6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02c",
-                    "stateRoot" : "0xfdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507",
+                    "receiptTrie" : "0x4332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674",
+                    "stateRoot" : "0x55436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a07ddbc8ca0e4b50ec7f3b6b8ca35bb52121c783581257527d0671f57ebc6af7cf88475d53d439fe5b7af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a00549c38e2a2ff4f5a86d12dd3468965fc4ecdab8f7958caf2579c88a512cc3aa88d63cfdbe3dede752f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa4f8bf73276cb9f1deced6f3f7ae520fc3611bc39f795f886c45cf36ab45a17",
-        "network" : "EIP150",
+        "lastblockhash" : "0x526b32f05ed702810894223869ac47cd26ed42556bda5cd0ea06b7ed3c04c944",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
@@ -137,10 +144,10 @@
             }
         }
     },
-    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -152,9 +159,154 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01debf",
-                    "hash" : "0x6c1e4d56eb8be5ba5ad9f6e7bb7194c9387ccd76cf6b3cd7c26c6d6b5ca1e08a",
-                    "mixHash" : "0xcaf1924d460badb77fd13a33936623c1075412d6ab80cc7d89d7ac0adc01169f",
-                    "nonce" : "0xbd9705b13a3deda2",
+                    "hash" : "0x129ceaede5dbff2efdcfdf67c9e491777fb2f7e17ff16ba4b34820955ba736de",
+                    "mixHash" : "0x8146f3a724ff5ed1b767f8935497d94ad0b23f18fc002e0df4e1e8c51d308e41",
+                    "nonce" : "0xf7e73422a96eb9b2",
+                    "number" : "0x01",
+                    "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
+                    "receiptTrie" : "0x4332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674",
+                    "stateRoot" : "0x55436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a08146f3a724ff5ed1b767f8935497d94ad0b23f18fc002e0df4e1e8c51d308e4188f7e73422a96eb9b2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x129ceaede5dbff2efdcfdf67c9e491777fb2f7e17ff16ba4b34820955ba736de",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000107" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x08" : "0x030d3e",
+                    "0x09" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000108" : {
+                "balance" : "0x00",
+                "code" : "0x5a600855",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x08" : "0x02b128"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5debf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a33141",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000107" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000108" : {
+                "balance" : "0x00",
+                "code" : "0x5a600855",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01debf",
+                    "hash" : "0xf9882ae1b93d7779e484a0be3eff53fc868cf68b70138d0932f72a47ebf45dcb",
+                    "mixHash" : "0x0737238a1962e1584b9f22e435344c2ec3a99e5913a218f372a8f653cffdb4d6",
+                    "nonce" : "0x1ef6dc21cf185612",
                     "number" : "0x01",
                     "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
                     "receiptTrie" : "0xd6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02c",
@@ -163,7 +315,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a0caf1924d460badb77fd13a33936623c1075412d6ab80cc7d89d7ac0adc01169f88bd9705b13a3deda2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a00737238a1962e1584b9f22e435344c2ec3a99e5913a218f372a8f653cffdb4d6881ef6dc21cf185612f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -200,8 +352,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c1e4d56eb8be5ba5ad9f6e7bb7194c9387ccd76cf6b3cd7c26c6d6b5ca1e08a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf9882ae1b93d7779e484a0be3eff53fc868cf68b70138d0932f72a47ebf45dcb",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
@@ -275,10 +427,10 @@
             }
         }
     },
-    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -289,19 +441,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03c165",
-                    "hash" : "0x0a8235e0d0baab36e5a3da6eea5569ad27bd018ceebb87470c42b9079d4ef647",
-                    "mixHash" : "0xb33fb74ad8a26fed0c7a540b7dc9730fcbcaefcff59b84350f25f9d00465c82c",
-                    "nonce" : "0x9e55c948303434bf",
+                    "gasUsed" : "0x01debf",
+                    "hash" : "0x193fc84015090ac2f64277754a1bde0529094b9aeed68d07edafafe63dcd47f9",
+                    "mixHash" : "0x7801b63d8dbe850ef0abc72862be4e031db160c7fddac367e378e789331cd22e",
+                    "nonce" : "0x75c1fc558ca6d38b",
                     "number" : "0x01",
                     "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
-                    "receiptTrie" : "0x331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cf",
-                    "stateRoot" : "0x31553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3d",
+                    "receiptTrie" : "0xd6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02c",
+                    "stateRoot" : "0xfdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303c1658203e880a0b33fb74ad8a26fed0c7a540b7dc9730fcbcaefcff59b84350f25f9d00465c82c889e55c948303434bff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb71bf9ad031b64aa432e036113aaf6d3b2317626d8536e812d7f91f9813507a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0d6b373e4a3879f53d81cc300a5736b643af80dd37a1f1ac8ad44b4f9efacb02cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a07801b63d8dbe850ef0abc72862be4e031db160c7fddac367e378e789331cd22e8875c1fc558ca6d38bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -338,14 +490,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a8235e0d0baab36e5a3da6eea5569ad27bd018ceebb87470c42b9079d4ef647",
-        "network" : "Frontier",
+        "lastblockhash" : "0x193fc84015090ac2f64277754a1bde0529094b9aeed68d07edafafe63dcd47f9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x08" : "0x030d3e",
+                    "0x09" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000108" : {
@@ -353,17 +507,18 @@
                 "code" : "0x5a600855",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x08" : "0x02b128"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7c165",
+                "balance" : "0x4563918244f5debf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a14e9b",
+                "balance" : "0xe8d4a33141",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -374,7 +529,8 @@
                 "code" : "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x08" : "0x08d5b6"
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
                 }
             }
         },
@@ -409,10 +565,10 @@
             }
         }
     },
-    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -424,9 +580,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x03c165",
-                    "hash" : "0xf053b64f92997923089456569601dcd8ea6dede8ad2b5750430f5122f928447a",
-                    "mixHash" : "0x2130934bb3fce22654aca90e4033ef5e0f43cd67f5f3220ad5c54ac2e5b01386",
-                    "nonce" : "0x8d836dd7492750cc",
+                    "hash" : "0x9ff1ad52bdc56e319b5cffe62e540f5193e7f190b7d6b50986cb792ae9dbc4d8",
+                    "mixHash" : "0xaabac6f52063d898394c30949cd3763517acb82a561ab8462d33b311ff0a74c7",
+                    "nonce" : "0x66055224aee55f65",
                     "number" : "0x01",
                     "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
                     "receiptTrie" : "0x331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cf",
@@ -435,7 +591,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303c1658203e880a02130934bb3fce22654aca90e4033ef5e0f43cd67f5f3220ad5c54ac2e5b01386888d836dd7492750ccf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303c1658203e880a0aabac6f52063d898394c30949cd3763517acb82a561ab8462d33b311ff0a74c78866055224aee55f65f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -472,8 +628,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf053b64f92997923089456569601dcd8ea6dede8ad2b5750430f5122f928447a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9ff1ad52bdc56e319b5cffe62e540f5193e7f190b7d6b50986cb792ae9dbc4d8",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
@@ -543,10 +699,10 @@
             }
         }
     },
-    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -557,19 +713,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01debf",
-                    "hash" : "0x8acf21d98427a88858ca3ea8c72a21afaeecba110b917dd18bbfbd865f9de9bb",
-                    "mixHash" : "0xd48d1f5d088033df609414cc525265fb44f15bd0475d71de0f5b33dfc741ddbf",
-                    "nonce" : "0x523813ffcf353aff",
+                    "gasUsed" : "0x03c165",
+                    "hash" : "0xec9c64cd38bcd3ade4a13142784366ed2d2007fa0579daba24de4b11ddbe67b9",
+                    "mixHash" : "0x8944d0690c49abf6a167d361d585d0b93c4eb0789ea9f71d111f6fa63ec9cd63",
+                    "nonce" : "0x0869d54a7d3b4788",
                     "number" : "0x01",
                     "parentHash" : "0xc98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9b",
-                    "receiptTrie" : "0x4332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674",
-                    "stateRoot" : "0x55436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929a",
+                    "receiptTrie" : "0x331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cf",
+                    "stateRoot" : "0x31553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055436c515851101b7fc248011f888b38dca27f35552d59cbc90f76b9603c929aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04332680793ff4c2e25f9e82cb07ef9ef94c477a2dda7ad6c0ed52cb1d2364674b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301debf8203e880a0d48d1f5d088033df609414cc525265fb44f15bd0475d71de0f5b33dfc741ddbf88523813ffcf353afff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0c98470495da8023ef1a298d8a3ce0d34e12ab381bf3326e5dffcdbed3a0b8d9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031553c5cf6def9b3896872e743fb927e2069fd8afbed143fff51fc60508baa3da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0331a2faf65de8dc6d57c74edff66c7e83c84fc76af18961c9a195b7b571166cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303c1658203e880a08944d0690c49abf6a167d361d585d0b93c4eb0789ea9f71d111f6fa63ec9cd63880869d54a7d3b4788f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -606,23 +762,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02277676aa2e2f2aa1d57fd47945d8b3ec0e9e460280a9f6be848ac3db7bf2cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8acf21d98427a88858ca3ea8c72a21afaeecba110b917dd18bbfbd865f9de9bb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xec9c64cd38bcd3ade4a13142784366ed2d2007fa0579daba24de4b11ddbe67b9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x08" : "0x030d3e",
-                    "0x09" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000108" : {
@@ -630,18 +777,17 @@
                 "code" : "0x5a600855",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x08" : "0x02b128"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5debf",
+                "balance" : "0x4563918244f7c165",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a33141",
+                "balance" : "0xe8d4a14e9b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -652,8 +798,7 @@
                 "code" : "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x08" : "0x08d5b6",
-                    "0x09" : "0x01"
+                    "0x08" : "0x08d5b6"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
index b7225ef36..7fa09ece1 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x3045250114ae005da8d85d2d90b1f9b2db555219a77e0202545af6589e830895",
-                    "mixHash" : "0x6b6300036dd96e4c832c0635a1d254e6dbfa7ded6a79d9f22d5c55688f09f596",
-                    "nonce" : "0x4fb1a669003b36cb",
+                    "hash" : "0x7567dc9d053f8cc6da4ec3c1365ac9fd63f7efb70e943bb60e50aa52be47e8ba",
+                    "mixHash" : "0x40d76f89b3585e3bb5786b4b08a424966fd7f5ef187366ad973439c24f514bcf",
+                    "nonce" : "0x14a0d89a1fbb09cc",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
-                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06b6300036dd96e4c832c0635a1d254e6dbfa7ded6a79d9f22d5c55688f09f596884fb1a669003b36cbf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a040d76f89b3585e3bb5786b4b08a424966fd7f5ef187366ad973439c24f514bcf8814a0d89a1fbb09ccf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3045250114ae005da8d85d2d90b1f9b2db555219a77e0202545af6589e830895",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7567dc9d053f8cc6da4ec3c1365ac9fd63f7efb70e943bb60e50aa52be47e8ba",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x9dec4747252cb6feb38f46c704a3333ec744dd47699516eef8fd4500e632112b",
-                    "mixHash" : "0xe62969300d97d4867219ba7917b5805d137f01768162adcdd342cf38ab8f5fb6",
-                    "nonce" : "0xfd9a1a6bacd547a5",
+                    "hash" : "0xfe4930e304dbca7284062622e5540a86acad1fe18540ff8e46118a117d588e08",
+                    "mixHash" : "0x458056e802651ebf4416998eb2219678cc6178a757524b8033d4187ddbee0e18",
+                    "nonce" : "0x05e5658abc64ed07",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
-                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e62969300d97d4867219ba7917b5805d137f01768162adcdd342cf38ab8f5fb688fd9a1a6bacd547a5f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0458056e802651ebf4416998eb2219678cc6178a757524b8033d4187ddbee0e188805e5658abc64ed07f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dec4747252cb6feb38f46c704a3333ec744dd47699516eef8fd4500e632112b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfe4930e304dbca7284062622e5540a86acad1fe18540ff8e46118a117d588e08",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xee28bfb30534a8b9a0ece8c6966948c8a1a99fe762057d06566b0c0fbdb61ade",
-                    "mixHash" : "0xeb0e0b0182277404e3ea48bed3a0c4dbcb90964f78dc4d47a4ffcb87b337b6ba",
-                    "nonce" : "0xbf66f384a2e9d8a5",
+                    "hash" : "0x8c1d421dfadab60c71714ff63f4daf40069b61e513be9ba8c1ed8b3468ce368e",
+                    "mixHash" : "0x92a671a4b11ab5ab7adcf606bc189f040d9a6f52f3fde91d46d628e232923544",
+                    "nonce" : "0x7bbf4777ecab91fa",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
                     "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0eb0e0b0182277404e3ea48bed3a0c4dbcb90964f78dc4d47a4ffcb87b337b6ba88bf66f384a2e9d8a5f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a092a671a4b11ab5ab7adcf606bc189f040d9a6f52f3fde91d46d628e232923544887bbf4777ecab91faf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee28bfb30534a8b9a0ece8c6966948c8a1a99fe762057d06566b0c0fbdb61ade",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8c1d421dfadab60c71714ff63f4daf40069b61e513be9ba8c1ed8b3468ce368e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x41ef352ff647edf19ad4896308341316fe233ed3df4338347bb8d4b141e584f3",
-                    "mixHash" : "0x1a1ba62b809a9a3c487fecb941ad1813bfbc5dc2b7ed58c2cd7dc420c5426066",
-                    "nonce" : "0xfc6e0ac310f3039b",
+                    "hash" : "0x16d0454d6ae4b637c7c03ffde09ebe5f996770f8fe1de25c27f8017049f0ce4a",
+                    "mixHash" : "0x7fe5117d46a02bf50147a417aa1a4bf9b603c8bd282e94817c77d4bc71d49312",
+                    "nonce" : "0xea256fc3d9e25eab",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
                     "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a01a1ba62b809a9a3c487fecb941ad1813bfbc5dc2b7ed58c2cd7dc420c542606688fc6e0ac310f3039bf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a07fe5117d46a02bf50147a417aa1a4bf9b603c8bd282e94817c77d4bc71d4931288ea256fc3d9e25eabf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41ef352ff647edf19ad4896308341316fe233ed3df4338347bb8d4b141e584f3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x16d0454d6ae4b637c7c03ffde09ebe5f996770f8fe1de25c27f8017049f0ce4a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x992696f4ac96bc1e095bd0d22f905b459002def821f4bc74917271c7111d0830",
-                    "mixHash" : "0x76096d097a27ea346d180e4c044dbc758bcf9140ca66d975085467fb2b8e7d2a",
-                    "nonce" : "0x64f0e00c4b878859",
+                    "hash" : "0xa6e8cd56721def85022d436e61cc745b0312cd8578038c8202492d5232289aeb",
+                    "mixHash" : "0xccc16f7cab14ae12180a3d93746d346e47685bdea0e722141fab890ff20a4dda",
+                    "nonce" : "0x9b247279e7748919",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
+                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
+                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a076096d097a27ea346d180e4c044dbc758bcf9140ca66d975085467fb2b8e7d2a8864f0e00c4b878859f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ccc16f7cab14ae12180a3d93746d346e47685bdea0e722141fab890ff20a4dda889b247279e7748919f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x992696f4ac96bc1e095bd0d22f905b459002def821f4bc74917271c7111d0830",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa6e8cd56721def85022d436e61cc745b0312cd8578038c8202492d5232289aeb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
+                "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
                 "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x347871fc2a83ce65d1170af5e080bed267bb21f262bda518b51d36e26292f405",
+                    "mixHash" : "0x469a53dc6fe7f14dca04874e9068aec2d320159044890d978867e64155117634",
+                    "nonce" : "0x903584adac51bee3",
+                    "number" : "0x01",
+                    "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
+                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
+                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0469a53dc6fe7f14dca04874e9068aec2d320159044890d978867e6415511763488903584adac51bee3f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4",
+                        "s" : "0x109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x347871fc2a83ce65d1170af5e080bed267bb21f262bda518b51d36e26292f405",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0.json
index c7cb6ea96..8eb009417 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x035b60",
-                    "hash" : "0x7c9cacb5c62a25bade0829a6d21e2356836dfbb02d42f9581f5b6fb11a9889de",
-                    "mixHash" : "0xa2fa740353a71498847d467bbc3e6007d06b9bcc1096d2eeb48c3d6292c5774d",
-                    "nonce" : "0x059916b15007a30d",
+                    "hash" : "0xbb26af95118d4a71855a98acb58538637afc7f837b03db24ff2cee75cce56a2f",
+                    "mixHash" : "0xdf3cee65e70e459a7a5ff567bf7cd09895187493dcf9890a0f9df053d3d09e83",
+                    "nonce" : "0x5e1a861f2ac3159b",
                     "number" : "0x01",
                     "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
-                    "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
-                    "stateRoot" : "0xde723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392e",
+                    "receiptTrie" : "0xbc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456ae",
+                    "stateRoot" : "0x5a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0a2fa740353a71498847d467bbc3e6007d06b9bcc1096d2eeb48c3d6292c5774d88059916b15007a30df862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5ba0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a0bc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0df3cee65e70e459a7a5ff567bf7cd09895187493dcf9890a0f9df053d3d09e83885e1a861f2ac3159bf862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c9cacb5c62a25bade0829a6d21e2356836dfbb02d42f9581f5b6fb11a9889de",
-        "network" : "EIP150",
+        "lastblockhash" : "0xbb26af95118d4a71855a98acb58538637afc7f837b03db24ff2cee75cce56a2f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x035b60",
-                    "hash" : "0xf4b470c2042fcb04337431fd0483028f6402dee593b45037a037bb67227cf4a2",
-                    "mixHash" : "0x574d91b9dbbedf537cf20c97ccadf2f083d8db7ce8717f20989d05ab18ac9ffe",
-                    "nonce" : "0xb1d59af866b9931d",
+                    "hash" : "0x703a58603ac365214f5074cc578e1d177b025b2bea6655ee4865daef36f11887",
+                    "mixHash" : "0x1ba121d72151666b4fda7a96a7fd05f114a2c02d83d5887b8bd6d01bfb2b00a1",
+                    "nonce" : "0x35f9788b86915fb6",
                     "number" : "0x01",
                     "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
-                    "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
-                    "stateRoot" : "0xde723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392e",
+                    "receiptTrie" : "0xbc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456ae",
+                    "stateRoot" : "0x5a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0574d91b9dbbedf537cf20c97ccadf2f083d8db7ce8717f20989d05ab18ac9ffe88b1d59af866b9931df862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5ba0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a0bc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a01ba121d72151666b4fda7a96a7fd05f114a2c02d83d5887b8bd6d01bfb2b00a18835f9788b86915fb6f862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4b470c2042fcb04337431fd0483028f6402dee593b45037a037bb67227cf4a2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x703a58603ac365214f5074cc578e1d177b025b2bea6655ee4865daef36f11887",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x035b60",
-                    "hash" : "0xc4702de125f7fa99226c1e3ffaaba007e79a09fbc05c0f4e60fab9ef97738643",
-                    "mixHash" : "0x4f90585c49948be8fd952f815046c60025922a33ec3f29bb522b26a5b1cfefde",
-                    "nonce" : "0x0b21c65d82a1392f",
+                    "hash" : "0x1cac7aa47e9867d7f0552194f8e09851f69a865fc25b3232650d525299258490",
+                    "mixHash" : "0xe576e2736d2466fd618ad2db0df1d5092b4fe6b63d58a11e437dbf501b75a3e8",
+                    "nonce" : "0x301542cffb76e102",
                     "number" : "0x01",
                     "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
                     "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a04f90585c49948be8fd952f815046c60025922a33ec3f29bb522b26a5b1cfefde880b21c65d82a1392ff862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0e576e2736d2466fd618ad2db0df1d5092b4fe6b63d58a11e437dbf501b75a3e888301542cffb76e102f862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4702de125f7fa99226c1e3ffaaba007e79a09fbc05c0f4e60fab9ef97738643",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1cac7aa47e9867d7f0552194f8e09851f69a865fc25b3232650d525299258490",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x035b60",
-                    "hash" : "0xcd1c0901ca9f5adf78b37f431b2b29439adda653d735ebd7707277eae3c9f06f",
-                    "mixHash" : "0xca7420692649a26175dfe2a5d73b49ee88cbeefdb08fa2d3f7c941670783c3fa",
-                    "nonce" : "0xfbc3c9248be17ed4",
+                    "hash" : "0x2e88e367474c359170ce81ebdc783ff022ef02c9f68f64c9b692b5bd62d7bfca",
+                    "mixHash" : "0x4567aa0608728a8beccd14b2a497d369b6a1aa964cff9cc76b435bb71e9c9875",
+                    "nonce" : "0xc80009bbc94074ae",
                     "number" : "0x01",
                     "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
                     "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0ca7420692649a26175dfe2a5d73b49ee88cbeefdb08fa2d3f7c941670783c3fa88fbc3c9248be17ed4f862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a04567aa0608728a8beccd14b2a497d369b6a1aa964cff9cc76b435bb71e9c987588c80009bbc94074aef862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd1c0901ca9f5adf78b37f431b2b29439adda653d735ebd7707277eae3c9f06f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2e88e367474c359170ce81ebdc783ff022ef02c9f68f64c9b692b5bd62d7bfca",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x035b60",
-                    "hash" : "0xa0c7ceb2c8b7a35f905ce547142bb9fb3f6208851c31ed5930e15e2b9954224c",
-                    "mixHash" : "0x155ce868d18a025f499887174faf2a52de03de68cfc2b46127927cdcaccf2d45",
-                    "nonce" : "0x2228c4313891f70d",
+                    "hash" : "0x029ad851c82b6cc014b9c8bed67661ee927ec6d9b54e0d613fccc8f9d5356a6b",
+                    "mixHash" : "0x4764fe7fe16fdef57e10d8c6fdcdd41034cbf91a44b52a82097b4994dfab34be",
+                    "nonce" : "0x81f9a44181a34aff",
                     "number" : "0x01",
                     "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
-                    "receiptTrie" : "0xbc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456ae",
-                    "stateRoot" : "0x5a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5b",
+                    "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
+                    "stateRoot" : "0xde723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a4e0166e54b72d28d638b21a9a16e547edfeee723747c132307160a16cd1a5ba0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a0bc509029849afaf54cf15e3aa49d1facdba9d1e5cb03029f91f40c7ee0f456aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0155ce868d18a025f499887174faf2a52de03de68cfc2b46127927cdcaccf2d45882228c4313891f70df862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a04764fe7fe16fdef57e10d8c6fdcdd41034cbf91a44b52a82097b4994dfab34be8881f9a44181a34afff862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0c7ceb2c8b7a35f905ce547142bb9fb3f6208851c31ed5930e15e2b9954224c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x029ad851c82b6cc014b9c8bed67661ee927ec6d9b54e0d613fccc8f9d5356a6b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000110" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000111" : {
+                "balance" : "0x00",
+                "code" : "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f75b60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a1b4a0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000110620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000110" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000111" : {
                 "balance" : "0x00",
+                "code" : "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000110620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x035b60",
+                    "hash" : "0xafbb4f548a587d90b19897b37f224f8b15945701b3fc2ca971520bc41c8fda10",
+                    "mixHash" : "0xb9feb3c299b543dd5ffc314e0039b22f9742fab85b5de83941c75e3844bed8da",
+                    "nonce" : "0x77758e1be4d84855",
+                    "number" : "0x01",
+                    "parentHash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
+                    "receiptTrie" : "0x6476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296",
+                    "stateRoot" : "0xde723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a040e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de723f3eb98f34d4421f21a99583d413bcbf67a38b3f53df625eacf70431392ea0778299110270c362288957e29ef88d9c7315bacd67359f9f8c03f6ffe6b79ec3a06476d9670d5389f0d8cd1a6fb2e035f4e54b32a27518e4ed8238f9a9c3aaa296b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083035b608203e880a0b9feb3c299b543dd5ffc314e0039b22f9742fab85b5de83941c75e3844bed8da8877758e1be4d84855f862f860800183035b6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6a031e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x035b60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x847209ee699a77891570bb06744dd6075a828587c935e45dfb023c2b3a95a5c6",
+                        "s" : "0x31e90653d76ee3cc7651b1964b207777f83768aaf80ac05c8304e134c636bc36",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x40e989adb8c32ef72ae0a33ea2292124bd9f71cd1b1b85e68ff3ee61e479b6b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297fdd0d67c8bd5e3ff4c3375bb704571bc8d7beb6106bdcc9683b8c4d21183aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xafbb4f548a587d90b19897b37f224f8b15945701b3fc2ca971520bc41c8fda10",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0.json
index 18c998e0c..4313d01ee 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x1adde0aaaa5421a43bcffd9ac743881186a196cb696cfd9cff7625be0cab1e89",
-                    "mixHash" : "0x01f7c9de9330ac97a66e685a7014073cf4e052b11d454d0def10dae33e188b39",
-                    "nonce" : "0x902d6179e3cfc20e",
+                    "hash" : "0x1cef651c94f68b7e1861788c022e0fb53895b45155f48f55a13c59e5195a34e0",
+                    "mixHash" : "0x593b8619bfbebf1c486acecdce54ad10879e4adde41728b0e4f4cf21edae0b83",
+                    "nonce" : "0x99220504534264ce",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0xf9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93",
-                    "stateRoot" : "0xc0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43",
+                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
+                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a001f7c9de9330ac97a66e685a7014073cf4e052b11d454d0def10dae33e188b3988902d6179e3cfc20ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0593b8619bfbebf1c486acecdce54ad10879e4adde41728b0e4f4cf21edae0b838899220504534264cef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1adde0aaaa5421a43bcffd9ac743881186a196cb696cfd9cff7625be0cab1e89",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1cef651c94f68b7e1861788c022e0fb53895b45155f48f55a13c59e5195a34e0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -92,7 +99,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0xfd" : "0x07ea53"
                 }
@@ -115,10 +122,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -130,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0xa4a36c13364650eea51ee5cd8903063b6ca6c31b45bbb2085b19c35541326ff5",
-                    "mixHash" : "0x6008368a571828b5ed32bbb350e17cf51e796542387f76195ebfbe48ee7fadee",
-                    "nonce" : "0x25cdb9028f250061",
+                    "hash" : "0x76a7e91cd775f77faccd9a98c808995b461d1bf033b1d6a98ec18aff80b25965",
+                    "mixHash" : "0x725c94ae50f9b5f002332cf800ed535ba25f8472b39d2d20d32f4366fc6c92d4",
+                    "nonce" : "0x59b5e5ecb3286947",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0xf9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4",
-                    "stateRoot" : "0xb10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0a",
+                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
+                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a06008368a571828b5ed32bbb350e17cf51e796542387f76195ebfbe48ee7fadee8825cdb9028f250061f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0725c94ae50f9b5f002332cf800ed535ba25f8472b39d2d20d32f4366fc6c92d48859b5e5ecb3286947f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -178,9 +185,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4a36c13364650eea51ee5cd8903063b6ca6c31b45bbb2085b19c35541326ff5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x76a7e91cd775f77faccd9a98c808995b461d1bf033b1d6a98ec18aff80b25965",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -231,10 +245,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -246,18 +260,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x65c768faebb537104e07190a0e9db5e3378e5403ee26d78d949318a89a4b80a9",
-                    "mixHash" : "0x6e7a32d4ed0d196dadcb1694140d62771452c182ded6e851a255e122745be0f6",
-                    "nonce" : "0xbaa4e2244b4aa591",
+                    "hash" : "0x80f39eb10066c0fd2192d1e9ad8946ae72ce3c3c93a4aa1458598638cd9da6d3",
+                    "mixHash" : "0xc4958b668a9eca5c526013e60d55523e84df9208ee59265f07a467bb93e21d85",
+                    "nonce" : "0x5c3929df7158f068",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
-                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "receiptTrie" : "0xf9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93",
+                    "stateRoot" : "0xc0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a06e7a32d4ed0d196dadcb1694140d62771452c182ded6e851a255e122745be0f688baa4e2244b4aa591f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0c4958b668a9eca5c526013e60d55523e84df9208ee59265f07a467bb93e21d85885c3929df7158f068f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -294,8 +308,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65c768faebb537104e07190a0e9db5e3378e5403ee26d78d949318a89a4b80a9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x80f39eb10066c0fd2192d1e9ad8946ae72ce3c3c93a4aa1458598638cd9da6d3",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
@@ -326,7 +340,7 @@
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x080a7c"
+                    "0xfd" : "0x07ea53"
                 }
             }
         },
@@ -347,10 +361,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -362,18 +376,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x319e6cc9df35bb66afafc83291990c62e5be9805e708c946a691020b117eba00",
-                    "mixHash" : "0x4da51ebb284f811ef497961e297c46a9ee0ed4e2b1237c84df97e6c9bcc6f157",
-                    "nonce" : "0x0cbbc0ee192013a2",
+                    "hash" : "0x45b353b3906c786480443c0403104c4036f7d928c5dabe6d8d9732574853072e",
+                    "mixHash" : "0x184166ed7eaa0ca9483d44bd19b956567fa126c03bc31500bcdf436ec748e578",
+                    "nonce" : "0x528bd1165d0901ff",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
-                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "receiptTrie" : "0xf9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4",
+                    "stateRoot" : "0xb10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a04da51ebb284f811ef497961e297c46a9ee0ed4e2b1237c84df97e6c9bcc6f157880cbbc0ee192013a2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0184166ed7eaa0ca9483d44bd19b956567fa126c03bc31500bcdf436ec748e57888528bd1165d0901fff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -410,8 +424,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x319e6cc9df35bb66afafc83291990c62e5be9805e708c946a691020b117eba00",
-        "network" : "Homestead",
+        "lastblockhash" : "0x45b353b3906c786480443c0403104c4036f7d928c5dabe6d8d9732574853072e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
@@ -440,9 +454,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
-                    "0xfd" : "0x080a7c"
+                    "0xfd" : "0x07ea53"
                 }
             }
         },
@@ -463,10 +477,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -478,18 +492,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x48ba9b7a0c1397a3e5c79bea1dadfd6ecc3b4fd58ff690bfa3b63da135f4b578",
-                    "mixHash" : "0x4b04db434273a17dc2e2ab703d9cf5d414de202d13c0fc37dff607b322ae9757",
-                    "nonce" : "0xc32ba60ee3da0951",
+                    "hash" : "0x86a26343a2b780a9d49c3a9bab19e3e01b527fe53bf5e2f888bb2bdb629b88f9",
+                    "mixHash" : "0xbcb2413a949ec288293458019103c939fdd25497d711c2ca02afc61fff71b1a0",
+                    "nonce" : "0x154176ca6ff38dc9",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
-                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
+                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
+                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a04b04db434273a17dc2e2ab703d9cf5d414de202d13c0fc37dff607b322ae975788c32ba60ee3da0951f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0bcb2413a949ec288293458019103c939fdd25497d711c2ca02afc61fff71b1a088154176ca6ff38dc9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -526,16 +540,125 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48ba9b7a0c1397a3e5c79bea1dadfd6ecc3b4fd58ff690bfa3b63da135f4b578",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x86a26343a2b780a9d49c3a9bab19e3e01b527fe53bf5e2f888bb2bdb629b88f9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f607af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a30851",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x09" : "0x076e34",
+                    "0x0a" : "0x08d5b6",
+                    "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0xfd" : "0x080a7c"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0207af",
+                    "hash" : "0xd61ac193d50d58db0bc7d27f410ceff6d3349eb4811bc41b4b61c515a9f182a5",
+                    "mixHash" : "0x333d68db2cd30513f694433c136be03e86deb25d7639d3b1a3fd5608106cb0b7",
+                    "nonce" : "0xb4ab9e0a81ea0adc",
+                    "number" : "0x01",
+                    "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
+                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
+                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0333d68db2cd30513f694433c136be03e86deb25d7639d3b1a3fd5608106cb0b788b4ab9e0a81ea0adcf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x32a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd61ac193d50d58db0bc7d27f410ceff6d3349eb4811bc41b4b61c515a9f182a5",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -563,9 +686,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x07ea53"
+                    "0xfd" : "0x080a7c"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0.json
index 47b2a4578..dddcbc757 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f74",
-                    "hash" : "0x29a5d81cfe2fcbf20e9cd3109bcce90b4cb40c70acf3e30bfef2504ea89dbc7c",
-                    "mixHash" : "0xa299d9194308d63db4d06444224afb41c9c0eb87b6841103933a083ed9b4acf7",
-                    "nonce" : "0xd1df8a0744902840",
+                    "hash" : "0x7fdf916de5241cc23739807ce2f803800d0eac8ce3cb26b8edd50fd7b3a811cd",
+                    "mixHash" : "0x7f2f8628ca2f81f32b7c863865f0ac7fdcc30cc4479daa294e99ca76b3d112bb",
+                    "nonce" : "0xca251ae59e64bbb6",
                     "number" : "0x01",
                     "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
-                    "receiptTrie" : "0xee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1e",
-                    "stateRoot" : "0x1cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210c",
+                    "receiptTrie" : "0xef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aee",
+                    "stateRoot" : "0x1f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a0a299d9194308d63db4d06444224afb41c9c0eb87b6841103933a083ed9b4acf788d1df8a0744902840f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a07f2f8628ca2f81f32b7c863865f0ac7fdcc30cc4479daa294e99ca76b3d112bb88ca251ae59e64bbb6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29a5d81cfe2fcbf20e9cd3109bcce90b4cb40c70acf3e30bfef2504ea89dbc7c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7fdf916de5241cc23739807ce2f803800d0eac8ce3cb26b8edd50fd7b3a811cd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f74",
-                    "hash" : "0xd7b96d59240c6d04c5da64bf25cdd41eaf281bce68cdb00151bd76b5b9d360fc",
-                    "mixHash" : "0x40779a901ed8c12f3b63f33789095f50aa29af10934d15f357157626c4df5a73",
-                    "nonce" : "0xa2ed1f8e8859b8a7",
+                    "hash" : "0x8715703cea2edb90f139c43a310bb4d9ab0ffc5f6be0b042a641404bd3330d6b",
+                    "mixHash" : "0x9d8a16b39e5e8edaed5af4dc300bc6fd95d240ac4cba80cf84f4e6cfbf824d1c",
+                    "nonce" : "0x1f2d2037299431ba",
+                    "number" : "0x01",
+                    "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
+                    "receiptTrie" : "0xef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aee",
+                    "stateRoot" : "0x1f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a09d8a16b39e5e8edaed5af4dc300bc6fd95d240ac4cba80cf84f4e6cfbf824d1c881f2d2037299431baf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8715703cea2edb90f139c43a310bb4d9ab0ffc5f6be0b042a641404bd3330d6b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000105" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f74",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d08c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000105" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f74",
+                    "hash" : "0x05d23a8ae33cfaf300940ec10ea5e8308269801d4b27cbcf6b34ce6d1194b5ed",
+                    "mixHash" : "0x5b79002de453143fa10355fcc26e1f3f700b11bf913d4fcf9ce79a6d8f1d5de8",
+                    "nonce" : "0x9f6fa873774b8208",
                     "number" : "0x01",
                     "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
                     "receiptTrie" : "0xee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1e",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a040779a901ed8c12f3b63f33789095f50aa29af10934d15f357157626c4df5a7388a2ed1f8e8859b8a7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a05b79002de453143fa10355fcc26e1f3f700b11bf913d4fcf9ce79a6d8f1d5de8889f6fa873774b8208f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7b96d59240c6d04c5da64bf25cdd41eaf281bce68cdb00151bd76b5b9d360fc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x05d23a8ae33cfaf300940ec10ea5e8308269801d4b27cbcf6b34ce6d1194b5ed",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0xcb5ea658e802315d9b79b995491a31f05954190497b9e532b3551182af8abcdb",
-                    "mixHash" : "0x93c282f5f81634a502eb08cbfe0fa663b3d10372dee122dca956dfce0b6c2a06",
-                    "nonce" : "0x58594f594cb17862",
+                    "gasUsed" : "0x013f74",
+                    "hash" : "0x96a9fb72a450f30cad79f698b488c5c318baca59666eac42345d48e3bb7fbf84",
+                    "mixHash" : "0xf4c346825748fcb1406a9877bdc3279743c73ab03708977b9428ced9289677ca",
+                    "nonce" : "0x9b19bdaacca1eeef",
                     "number" : "0x01",
                     "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
-                    "receiptTrie" : "0x0ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4c",
-                    "stateRoot" : "0x8b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27",
+                    "receiptTrie" : "0xee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1e",
+                    "stateRoot" : "0x1cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a093c282f5f81634a502eb08cbfe0fa663b3d10372dee122dca956dfce0b6c2a068858594f594cb17862f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cd0fa5473e87ac76060dfaddecef70bf8a63f564ecac1c20633b4a51cac210ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ee07dfbb7e78b7d86754aacb3f0952501c9effb3fd3534b5449507e0ed8dbf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a0f4c346825748fcb1406a9877bdc3279743c73ab03708977b9428ced9289677ca889b19bdaacca1eeeff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb5ea658e802315d9b79b995491a31f05954190497b9e532b3551182af8abcdb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x96a9fb72a450f30cad79f698b488c5c318baca59666eac42345d48e3bb7fbf84",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
+                "balance" : "0x4563918244f53f74",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49be840",
+                "balance" : "0xe8d4a3d08c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "0x87b28a38a269ff38aa87b04fb4c868398a4a9e608e2470a0e9b4a84d7b78ce5e",
-                    "mixHash" : "0xe4e4cfdcac506237857d4123e9d44284ec04a49a481ad543a5e06540eb6ba52c",
-                    "nonce" : "0xbb73c12dbd8632f6",
+                    "hash" : "0x5d6af74658cb6af921d64ecf34967992747fab88a385594f0093c9d53e28e370",
+                    "mixHash" : "0x18ce8093562943486b05a61879bc64b0488d23bf3c6bbd997bdb7e538699072a",
+                    "nonce" : "0xaf3f9415769d7cb4",
                     "number" : "0x01",
                     "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
                     "receiptTrie" : "0x0ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4c",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0e4e4cfdcac506237857d4123e9d44284ec04a49a481ad543a5e06540eb6ba52c88bb73c12dbd8632f6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a018ce8093562943486b05a61879bc64b0488d23bf3c6bbd997bdb7e538699072a88af3f9415769d7cb4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87b28a38a269ff38aa87b04fb4c868398a4a9e608e2470a0e9b4a84d7b78ce5e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5d6af74658cb6af921d64ecf34967992747fab88a385594f0093c9d53e28e370",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "DelegateCallOnEIPWithMemExpandingCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f74",
-                    "hash" : "0xe6eef2168f7be825a2263ebbe5eb50f047f9a2220e58afe43b1cf5497c483c07",
-                    "mixHash" : "0x2b9fe39cb2f5a165130a0464278fc83491bfe7b358d94fa9f3727dedb04a7362",
-                    "nonce" : "0xc9672288f1377225",
+                    "gasUsed" : "0x0927c0",
+                    "hash" : "0x8090f1f26117aaecb8d229b69f39317d9035162664b02c0430043e835031f5a6",
+                    "mixHash" : "0x92943bf9b900877a84fd62bf8d2566a5342a46efe03035fe6b967cb64a40d787",
+                    "nonce" : "0xe0a8b4b08190e186",
                     "number" : "0x01",
                     "parentHash" : "0x8f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130d",
-                    "receiptTrie" : "0xef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aee",
-                    "stateRoot" : "0x1f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914",
+                    "receiptTrie" : "0x0ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4c",
+                    "stateRoot" : "0x8b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f49e2ad813b3d1d2fb81cadecedeec24cdc5faa46786ee5e67d083a4944a914a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0ef404013a935286016e9c0ff07d702f880f4f3f26c8fac6cbc64d3f0a7f99aeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f748203e880a02b9fe39cb2f5a165130a0464278fc83491bfe7b358d94fa9f3727dedb04a736288c9672288f1377225f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a08f131fa00a91627034e948aa05872ca70fc3c7a9912318684738d7139f40130da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b79aab9fe48a6ea1373caa63995f404004a7e8265403a94b888db5b4cb25c27a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00ee24bef0bd27c2b39f647841a1443a81d39e7f6a03a8376fb307b18e7da8a4cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a092943bf9b900877a84fd62bf8d2566a5342a46efe03035fe6b967cb64a40d78788e0a8b4b08190e186f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00724373379ac54e8416a38e60b623eb362c06dce43ff7cfba0c1aca91ff3cc86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6eef2168f7be825a2263ebbe5eb50f047f9a2220e58afe43b1cf5497c483c07",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8090f1f26117aaecb8d229b69f39317d9035162664b02c0430043e835031f5a6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f74",
+                "balance" : "0x4563918244fd27c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d08c",
+                "balance" : "0xe8d49be840",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x12",
-                    "0x08" : "0x08d5b6",
-                    "0x09" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
index 7ebfdc585..2b1f0d32d 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf152",
-                    "hash" : "0x71d2fdcce2d016898f89cb09726084722fbe34919fbb1f112c736f53a8ac0107",
-                    "mixHash" : "0x2f258a6d6eee763983a38eabdd1112f405aa9acf4990fe32c5d6fec04f6eeb9b",
-                    "nonce" : "0xedd24b1ecb7c5e34",
+                    "hash" : "0x7b73d27dcf88e827ea8f5792044ba27d5c4d19c27bbd46551d01efb8cd0551cd",
+                    "mixHash" : "0xaa64b78cffbb881deaab87dde4afc9cbac65b8749c0319eab9e24f93549bf773",
+                    "nonce" : "0xe23d7af083f4f178",
                     "number" : "0x01",
                     "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
-                    "receiptTrie" : "0x299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848",
-                    "stateRoot" : "0x4f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231ea",
+                    "receiptTrie" : "0xd7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497",
+                    "stateRoot" : "0x8b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231eaa035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a02f258a6d6eee763983a38eabdd1112f405aa9acf4990fe32c5d6fec04f6eeb9b88edd24b1ecb7c5e34f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0d7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a0aa64b78cffbb881deaab87dde4afc9cbac65b8749c0319eab9e24f93549bf77388e23d7af083f4f178f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71d2fdcce2d016898f89cb09726084722fbe34919fbb1f112c736f53a8ac0107",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7b73d27dcf88e827ea8f5792044ba27d5c4d19c27bbd46551d01efb8cd0551cd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600c600155",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf152",
+                    "hash" : "0x4bb325ebdc72edda520aeba3fb9a1c15e458ce1a079ba96c821e2ddbd363e9fc",
+                    "mixHash" : "0x7e3399ddf88c4069187f2daa9847410da04421b9bd8cbf23975309b7ef9b100c",
+                    "nonce" : "0xce2fd0c02546f7f8",
+                    "number" : "0x01",
+                    "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
+                    "receiptTrie" : "0xd7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497",
+                    "stateRoot" : "0x8b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0d7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a07e3399ddf88c4069187f2daa9847410da04421b9bd8cbf23975309b7ef9b100c88ce2fd0c02546f7f8f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317",
+                        "s" : "0x4659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4bb325ebdc72edda520aeba3fb9a1c15e458ce1a079ba96c821e2ddbd363e9fc",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x0c"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f152",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x954e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf152",
-                    "hash" : "0xe3858a27b2199df92a874681163fba5241badc6a819b666221d210aaa92cddae",
-                    "mixHash" : "0x3c486bba10341b19a0763505f4af75f757dee78ec34c2074eb34993622057fce",
-                    "nonce" : "0xb549a142eebcd9af",
+                    "hash" : "0xb30d040e157934bd70fffe21c31b218f3085534201164ef1a27211f6c064ccc2",
+                    "mixHash" : "0x664e3b050e65dd1d8742156909aac922b8215a8494086ad060af697315b14390",
+                    "nonce" : "0xd1cd1981c2b8073c",
                     "number" : "0x01",
                     "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
                     "receiptTrie" : "0x299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231eaa035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a03c486bba10341b19a0763505f4af75f757dee78ec34c2074eb34993622057fce88b549a142eebcd9aff862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231eaa035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a0664e3b050e65dd1d8742156909aac922b8215a8494086ad060af697315b1439088d1cd1981c2b8073cf862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3858a27b2199df92a874681163fba5241badc6a819b666221d210aaa92cddae",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb30d040e157934bd70fffe21c31b218f3085534201164ef1a27211f6c064ccc2",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0186a0",
-                    "hash" : "0x6cb9d4b9dbdc67abe0f05dfb5bd5ec07534423860cad13aaac6d06ff5cd1ea4f",
-                    "mixHash" : "0x927b698ee9adf9b0ddb005d166302e3e8e3ef06fda0879eebc70ef9cc2112086",
-                    "nonce" : "0xfacedc8d0f3a690a",
+                    "gasUsed" : "0xf152",
+                    "hash" : "0xd99d40c1504bf84e1d8453474ffad93fff652a070ff3d3d8ca0a9f17b0dfc0ea",
+                    "mixHash" : "0xae69dd6b05f181cc3fc2f29873c471f688c5c0e64f3b14321499b7a3ffcf4274",
+                    "nonce" : "0x419777f99deff2c4",
                     "number" : "0x01",
                     "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
-                    "receiptTrie" : "0x4e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3",
-                    "stateRoot" : "0x791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0",
+                    "receiptTrie" : "0x299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848",
+                    "stateRoot" : "0x4f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa04e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a0927b698ee9adf9b0ddb005d166302e3e8e3ef06fda0879eebc70ef9cc211208688facedc8d0f3a690af862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f4cf793456fe9899da26c3f2fd9257193f5dde2d1c8be8e051b96d50a8231eaa035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0299b7bd74a271799dcd7b98402959d47d918196c268a5317725a5699d9cff848b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a0ae69dd6b05f181cc3fc2f29873c471f688c5c0e64f3b14321499b7a3ffcf427488419777f99deff2c4f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,25 +439,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cb9d4b9dbdc67abe0f05dfb5bd5ec07534423860cad13aaac6d06ff5cd1ea4f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd99d40c1504bf84e1d8453474ffad93fff652a070ff3d3d8ca0a9f17b0dfc0ea",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x0c"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f586a0",
+                "balance" : "0x4563918244f4f152",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x954e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -333,6 +469,7 @@
                 "code" : "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             }
         },
@@ -360,10 +497,10 @@
             }
         }
     },
-    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x6c1b9457b66e3dc43ee48dafe0d593e184dee6c77fa7586343d0220b1a1b8507",
-                    "mixHash" : "0xe2e095e5b86548011c41a4c07203f06468bbd441cda043e3c68f3425ce5b0ada",
-                    "nonce" : "0xafec5eed992f4b94",
+                    "hash" : "0x4d8b574560e104cbeb2092143e8beb7c93e63242d9b1f18f94cbce2ccc726a0c",
+                    "mixHash" : "0xb6929baaeb5419d642fce7bac396c105aff6f49ef6cb0049cfb2a408edb23934",
+                    "nonce" : "0xdfc9b196ba9f6503",
                     "number" : "0x01",
                     "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
                     "receiptTrie" : "0x4e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa04e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a0e2e095e5b86548011c41a4c07203f06468bbd441cda043e3c68f3425ce5b0ada88afec5eed992f4b94f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa04e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a0b6929baaeb5419d642fce7bac396c105aff6f49ef6cb0049cfb2a408edb2393488dfc9b196ba9f6503f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c1b9457b66e3dc43ee48dafe0d593e184dee6c77fa7586343d0220b1a1b8507",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4d8b574560e104cbeb2092143e8beb7c93e63242d9b1f18f94cbce2ccc726a0c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf152",
-                    "hash" : "0xa22f59a7d5cbcd7e46aa6956cfb997d878f6342a86507fa49056faae220de5c9",
-                    "mixHash" : "0x10cb64e2feb605070741c1eba55d7981c85b4d49f59328ff21c245443e4d6c0e",
-                    "nonce" : "0x3f2809aa910ef7eb",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0x9bad81a9a3008637b2e44abb244922b2318b32a35ab6661674cc8bd71c3e90fa",
+                    "mixHash" : "0x8667f2893dbb1a687149715827a0ee44ffe18c44c06c79f2509497612a19626a",
+                    "nonce" : "0x95efbe7e27683f55",
                     "number" : "0x01",
                     "parentHash" : "0x5c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889be",
-                    "receiptTrie" : "0xd7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497",
-                    "stateRoot" : "0x8b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277",
+                    "receiptTrie" : "0x4e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3",
+                    "stateRoot" : "0x791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b4b03d35ef4dc20104c2c26d309143abf54534469a9ceb647b216a4501bb277a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0d7647e9d152f1c99fa7f81de6b4e039333c3d428ed3e79cf79727016f03f7497b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1528203e880a010cb64e2feb605070741c1eba55d7981c85b4d49f59328ff21c245443e4d6c0e883f2809aa910ef7ebf862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a05c2b3e680f28ebc6a421d12771ed514410b338b02947c035cc73e379790889bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0791e4806f9d7d27b7bc1a07936edbcac48a78a8b17962cf4cd5c4fe127219da0a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa04e6aa6640786778b198f7123941d25eb83457c598a44e58e0695bbd0ce4f39f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a08667f2893dbb1a687149715827a0ee44ffe18c44c06c79f2509497612a19626a8895efbe7e27683f55f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,33 +679,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0300c2b569a34c84d28ddc12be7ea8e4d077d683b562a9b375ebc49c399f84c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa22f59a7d5cbcd7e46aa6956cfb997d878f6342a86507fa49056faae220de5c9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9bad81a9a3008637b2e44abb244922b2318b32a35ab6661674cc8bd71c3e90fa",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x0c"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f152",
+                "balance" : "0x4563918244f586a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x954e",
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -579,7 +708,6 @@
                 "code" : "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0.json
index e1f715163..eebde4d4f 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_EIP150" : {
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03939a",
-                    "hash" : "0xb4b097d9dfcd5e6d20a70449b3356198a8db92dc4107213dae02a563a69e1e6d",
-                    "mixHash" : "0x1901a06cb1f73f4f5793797a806a8ae132cfb92efc1274d74ccbe1fd8891c28f",
-                    "nonce" : "0xe3d6e77f285cc6ec",
+                    "gasUsed" : "0x0331f2",
+                    "hash" : "0xae4a42fdff762a2f993a44582cd4008960b58e7c3bece865d32bb5f43bb4f40e",
+                    "mixHash" : "0xd2c2bb3b1a7f18ada64a35ae5223c183a350d6f809d28984a467a8cc9de7461e",
+                    "nonce" : "0x4b241a1f272baa8e",
                     "number" : "0x01",
                     "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
-                    "receiptTrie" : "0x822ffa3890553f6349bcf9462a26ad0204334c329cad691efd105a615d0e69d9",
-                    "stateRoot" : "0x2b81a6e52c61f177b9058ab892f51cd0da42d40193213faa6aa18adf2dbd35f4",
+                    "receiptTrie" : "0xa57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951",
+                    "stateRoot" : "0x9a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b81a6e52c61f177b9058ab892f51cd0da42d40193213faa6aa18adf2dbd35f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0822ffa3890553f6349bcf9462a26ad0204334c329cad691efd105a615d0e69d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303939a8203e880a01901a06cb1f73f4f5793797a806a8ae132cfb92efc1274d74ccbe1fd8891c28f88e3d6e77f285cc6ecf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830331f28203e880a0d2c2bb3b1a7f18ada64a35ae5223c183a350d6f809d28984a467a8cc9de7461e884b241a1f272baa8ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4b097d9dfcd5e6d20a70449b3356198a8db92dc4107213dae02a563a69e1e6d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xae4a42fdff762a2f993a44582cd4008960b58e7c3bece865d32bb5f43bb4f40e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
@@ -79,22 +86,15 @@
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000013" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7939a",
+                "balance" : "0x4563918244f731f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a17c66",
+                "balance" : "0xe8d4a1de0e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,7 +112,7 @@
                     "0x04" : "0x12",
                     "0x07" : "0x01",
                     "0x08" : "0x01",
-                    "0x0a" : "0x05e249",
+                    "0x0a" : "0x0643f1",
                     "0x64" : "0x11"
                 }
             }
@@ -149,10 +149,10 @@
             }
         }
     },
-    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_EIP158" : {
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -164,18 +164,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0331f2",
-                    "hash" : "0x2e88027120eadc16d3473ab254ef3bff377ca36e3950d922cf1c0dc04875dd3b",
-                    "mixHash" : "0xf5068894e2d0524cc65b541b9a854b451ec35083621d143f8b1a2ac79262b0ef",
-                    "nonce" : "0xcdf6bff9683753f3",
+                    "hash" : "0x7ebff2c731fe7fc99b212586186671a072b871209e0c786b5fd42a070c811672",
+                    "mixHash" : "0x4f47e05245d3e4ca061fd085a37f1887ff067f1820b8138923d40b27bf193869",
+                    "nonce" : "0x8c38f9800b36815b",
                     "number" : "0x01",
                     "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
-                    "receiptTrie" : "0xbf468f0508ca082085c729152aa3a09097e0a0071543a67fb32869e0ec34bb02",
-                    "stateRoot" : "0x70bd64ac5bd307f23768ec37af963215bc2894bdf5482abc67904ad76fdcdcd0",
+                    "receiptTrie" : "0xa57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951",
+                    "stateRoot" : "0x9a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070bd64ac5bd307f23768ec37af963215bc2894bdf5482abc67904ad76fdcdcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bf468f0508ca082085c729152aa3a09097e0a0071543a67fb32869e0ec34bb02b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830331f28203e880a0f5068894e2d0524cc65b541b9a854b451ec35083621d143f8b1a2ac79262b0ef88cdf6bff9683753f3f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830331f28203e880a04f47e05245d3e4ca061fd085a37f1887ff067f1820b8138923d40b27bf193869888c38f9800b36815bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -212,9 +212,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e88027120eadc16d3473ab254ef3bff377ca36e3950d922cf1c0dc04875dd3b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7ebff2c731fe7fc99b212586186671a072b871209e0c786b5fd42a070c811672",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
@@ -292,10 +299,10 @@
             }
         }
     },
-    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Frontier" : {
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -306,19 +313,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x7ba528475890f16ec23fffe12bcf20333fc2eb0f0a42ecf4cbe6a0637086b1c7",
-                    "mixHash" : "0x5f9d4f6e387caf73342bce0ecf0b102cae9ddadff84d18930a39cb1dc212995d",
-                    "nonce" : "0xd1bee40ce1a13aa5",
+                    "gasUsed" : "0x03939a",
+                    "hash" : "0x68f01d455bc66d16c4f04155a362e9d7b7a83be5ae8a17727a85e77f75d90b9a",
+                    "mixHash" : "0x39633961eb8888da6baf59925004e33eeefb5513a31c58771cf99fe585e65d58",
+                    "nonce" : "0xb19445e279ee82b9",
                     "number" : "0x01",
                     "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
-                    "receiptTrie" : "0x4460367a148481ddfc4d44e38f64ec216ddfd7e482f82fa4728c451c1d929896",
-                    "stateRoot" : "0x9ac7d20655aa14f33de165b6318add12e6ebeadc9b65c7e06079f605cab1de63",
+                    "receiptTrie" : "0x822ffa3890553f6349bcf9462a26ad0204334c329cad691efd105a615d0e69d9",
+                    "stateRoot" : "0x2b81a6e52c61f177b9058ab892f51cd0da42d40193213faa6aa18adf2dbd35f4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ac7d20655aa14f33de165b6318add12e6ebeadc9b65c7e06079f605cab1de63a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04460367a148481ddfc4d44e38f64ec216ddfd7e482f82fa4728c451c1d929896b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a05f9d4f6e387caf73342bce0ecf0b102cae9ddadff84d18930a39cb1dc212995d88d1bee40ce1a13aa5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b81a6e52c61f177b9058ab892f51cd0da42d40193213faa6aa18adf2dbd35f4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0822ffa3890553f6349bcf9462a26ad0204334c329cad691efd105a615d0e69d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303939a8203e880a039633961eb8888da6baf59925004e33eeefb5513a31c58771cf99fe585e65d5888b19445e279ee82b9f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -355,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ba528475890f16ec23fffe12bcf20333fc2eb0f0a42ecf4cbe6a0637086b1c7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x68f01d455bc66d16c4f04155a362e9d7b7a83be5ae8a17727a85e77f75d90b9a",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
@@ -372,15 +379,22 @@
                 "storage" : {
                 }
             },
+            "0x1000000000000000000000000000000000000013" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
+                "balance" : "0x4563918244f7939a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49be840",
+                "balance" : "0xe8d4a17c66",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -391,7 +405,15 @@
                 "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x12"
+                    "0x00" : "0x12",
+                    "0x01" : "0x20",
+                    "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
+                    "0x03" : "0xe8d49be840",
+                    "0x04" : "0x12",
+                    "0x07" : "0x01",
+                    "0x08" : "0x01",
+                    "0x0a" : "0x05e249",
+                    "0x64" : "0x11"
                 }
             }
         },
@@ -427,10 +449,10 @@
             }
         }
     },
-    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Homestead" : {
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +463,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0381e8",
-                    "hash" : "0x55e86d7009fe41a1e7615b9405620346c367a375dabc6c23d2b5740fa8ed6e1c",
-                    "mixHash" : "0x996aff1f5d72d043d66ac582f8b2619595b2b74970b1be39e2c7e56f984d4dd4",
-                    "nonce" : "0x426fb8dfb4439cbe",
+                    "gasUsed" : "0x0331f2",
+                    "hash" : "0xd25387cd3d299a2235651f2e3da27aa4cf3f73e91f95c793fd7ace1955c9e4ec",
+                    "mixHash" : "0x1c091ad09f01cdfa725b0071ac33c67df0db4e87d61af5f35914bfa8f35fa76c",
+                    "nonce" : "0xa257dcf852627ffb",
                     "number" : "0x01",
                     "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
-                    "receiptTrie" : "0xeea396e3b570dfd98d28fa4e11b8a1959031429871effb4b71014cf443114362",
-                    "stateRoot" : "0xf2482118423bb003a07ad746de3ad3d4490d99d406903f01d6565153d68813e8",
+                    "receiptTrie" : "0xbf468f0508ca082085c729152aa3a09097e0a0071543a67fb32869e0ec34bb02",
+                    "stateRoot" : "0x70bd64ac5bd307f23768ec37af963215bc2894bdf5482abc67904ad76fdcdcd0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2482118423bb003a07ad746de3ad3d4490d99d406903f01d6565153d68813e8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0eea396e3b570dfd98d28fa4e11b8a1959031429871effb4b71014cf443114362b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830381e88203e880a0996aff1f5d72d043d66ac582f8b2619595b2b74970b1be39e2c7e56f984d4dd488426fb8dfb4439cbef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070bd64ac5bd307f23768ec37af963215bc2894bdf5482abc67904ad76fdcdcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bf468f0508ca082085c729152aa3a09097e0a0071543a67fb32869e0ec34bb02b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830331f28203e880a01c091ad09f01cdfa725b0071ac33c67df0db4e87d61af5f35914bfa8f35fa76c88a257dcf852627ffbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,8 +512,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55e86d7009fe41a1e7615b9405620346c367a375dabc6c23d2b5740fa8ed6e1c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd25387cd3d299a2235651f2e3da27aa4cf3f73e91f95c793fd7ace1955c9e4ec",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
@@ -507,22 +529,15 @@
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000013" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f781e8",
+                "balance" : "0x4563918244f731f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a18e18",
+                "balance" : "0xe8d4a1de0e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -540,7 +555,7 @@
                     "0x04" : "0x12",
                     "0x07" : "0x01",
                     "0x08" : "0x01",
-                    "0x0a" : "0x05f3fb",
+                    "0x0a" : "0x0643f1",
                     "0x64" : "0x11"
                 }
             }
@@ -577,10 +592,10 @@
             }
         }
     },
-    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -591,19 +606,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0331f2",
-                    "hash" : "0x1e6842e691b0abc5de556763f20c2752a200829bb7fa6ba7c6d92b708bf45e36",
-                    "mixHash" : "0x212853b6de71a2484c2bc8458ed8a491aeaed7e5f271cc965bb5f6771be2958e",
-                    "nonce" : "0x8e1c30f3eccedbc2",
+                    "gasUsed" : "0x0927c0",
+                    "hash" : "0x6b8e6a93ba06c05c0c0422d1b0833ba7d0fceaefb5360c1028c80e6941d10bff",
+                    "mixHash" : "0x600e7228776a8ffcf2a768323697c11755e694765e808cd1f12e97b4a9c98c79",
+                    "nonce" : "0x37b5b8d48901bf0f",
                     "number" : "0x01",
                     "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
-                    "receiptTrie" : "0xa57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951",
-                    "stateRoot" : "0x9a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6",
+                    "receiptTrie" : "0x4460367a148481ddfc4d44e38f64ec216ddfd7e482f82fa4728c451c1d929896",
+                    "stateRoot" : "0x9ac7d20655aa14f33de165b6318add12e6ebeadc9b65c7e06079f605cab1de63",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a14be12679a48cc780158b9cc1248d3f3842aa095819d443e873b8ed9f55ef6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a57b8a2067ad4e85bba4990ec3ea20a756c6d9741e68b23326dfdc059c6e7951b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830331f28203e880a0212853b6de71a2484c2bc8458ed8a491aeaed7e5f271cc965bb5f6771be2958e888e1c30f3eccedbc2f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ac7d20655aa14f33de165b6318add12e6ebeadc9b65c7e06079f605cab1de63a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a04460367a148481ddfc4d44e38f64ec216ddfd7e482f82fa4728c451c1d929896b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0600e7228776a8ffcf2a768323697c11755e694765e808cd1f12e97b4a9c98c798837b5b8d48901bf0ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -640,16 +655,144 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e6842e691b0abc5de556763f20c2752a200829bb7fa6ba7c6d92b708bf45e36",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6b8e6a93ba06c05c0c0422d1b0833ba7d0fceaefb5360c1028c80e6941d10bff",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000010" : {
+                "balance" : "0x6f",
+                "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000011" : {
+                "balance" : "0x00",
+                "code" : "0x6011606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fd27c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49be840",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000010" : {
+                "balance" : "0x6f",
+                "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
+                "code" : "0x6011606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12"
+                }
+            }
+        }
+    },
+    "NewGasPriceForCodesWithMemExpandingCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0381e8",
+                    "hash" : "0x5f4d2c6ef22165e242178343f1dbd459142d05f1bcb0b84308a192627cdf2e45",
+                    "mixHash" : "0xc9e3e1c2a37ffca48dc3fe7a49cd4da28e3cb2dbf907d924f619b8ab3e5fd6c8",
+                    "nonce" : "0x73fc34525e1173cb",
+                    "number" : "0x01",
+                    "parentHash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
+                    "receiptTrie" : "0xeea396e3b570dfd98d28fa4e11b8a1959031429871effb4b71014cf443114362",
+                    "stateRoot" : "0xf2482118423bb003a07ad746de3ad3d4490d99d406903f01d6565153d68813e8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a009c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2482118423bb003a07ad746de3ad3d4490d99d406903f01d6565153d68813e8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0eea396e3b570dfd98d28fa4e11b8a1959031429871effb4b71014cf443114362b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830381e88203e880a0c9e3e1c2a37ffca48dc3fe7a49cd4da28e3cb2dbf907d924f619b8ab3e5fd6c88873fc34525e1173cbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x09c8194e6e76d95fd90470a74b3099924d84c38694f3ca1f8c78bed7a3dd9b0c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c11e0ffa4a895012fe3db0ca44d93fc579f485488a67989db49ee464bff1d0c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5f4d2c6ef22165e242178343f1dbd459142d05f1bcb0b84308a192627cdf2e45",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
@@ -664,15 +807,22 @@
                 "storage" : {
                 }
             },
+            "0x1000000000000000000000000000000000000013" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f731f2",
+                "balance" : "0x4563918244f781e8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a1de0e",
+                "balance" : "0xe8d4a18e18",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -690,7 +840,7 @@
                     "0x04" : "0x12",
                     "0x07" : "0x01",
                     "0x08" : "0x01",
-                    "0x0a" : "0x0643f1",
+                    "0x0a" : "0x05f3fb",
                     "0x64" : "0x11"
                 }
             }