Hive tests with Byzantine

24 files changed, 3920 insertions, 1108 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0.json
index c48c4dbe1..c1f24fdf1 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALLCODE_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x1dd70b0a1ed79eac28516b1c4f7f2e8125b4c73f6872c294184d12e62f91ff07",
-                    "mixHash" : "0xee966510a973d682507ac11cf6f48ef17a5932cce1badfd5090553744d1365ae",
-                    "nonce" : "0x0eab7508290a23e4",
+                    "hash" : "0x5487271a03d766c59708172de001691dc6d5435cf20c83b6edda40c4e3d5a8d2",
+                    "mixHash" : "0x31b732cba901a1a4f88a90defd4f1f69d2598ad527dc45ff5b95a35c43cc233f",
+                    "nonce" : "0xb4382e9d95857e50",
                     "number" : "0x01",
                     "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
-                    "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
-                    "stateRoot" : "0x32b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x6eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0ee966510a973d682507ac11cf6f48ef17a5932cce1badfd5090553744d1365ae880eab7508290a23e4f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3ca0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a031b732cba901a1a4f88a90defd4f1f69d2598ad527dc45ff5b95a35c43cc233f88b4382e9d95857e50f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1dd70b0a1ed79eac28516b1c4f7f2e8125b4c73f6872c294184d12e62f91ff07",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5487271a03d766c59708172de001691dc6d5435cf20c83b6edda40c4e3d5a8d2",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALLCODE_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x757c105a5e9848316474be154171bc1de3fdd50564dd1f3ede87c5df5243dcc3",
-                    "mixHash" : "0xa6dd58dd4e4eb315771d629781e9c83e205b45a7831e5799cc63441a9374e087",
-                    "nonce" : "0x3b57f1340ea0f683",
+                    "hash" : "0x915dd2dfe5a97bbb145fe3ef9d553aa0e08f4380f32ab69de15f43750f7d2c38",
+                    "mixHash" : "0xc84fb7a44384e3fff2fa19dcee42603444791e9dcca6891b9bc908f70763444c",
+                    "nonce" : "0x9187e93ca57bb832",
                     "number" : "0x01",
                     "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
-                    "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
-                    "stateRoot" : "0x32b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x6eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a6dd58dd4e4eb315771d629781e9c83e205b45a7831e5799cc63441a9374e087883b57f1340ea0f683f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3ca0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c84fb7a44384e3fff2fa19dcee42603444791e9dcca6891b9bc908f70763444c889187e93ca57bb832f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x757c105a5e9848316474be154171bc1de3fdd50564dd1f3ede87c5df5243dcc3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x915dd2dfe5a97bbb145fe3ef9d553aa0e08f4380f32ab69de15f43750f7d2c38",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALLCODE_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xb9361b4f35d7db41af0490e1b08d146db0ac97324cfd7c33844090e9806a1e2e",
-                    "mixHash" : "0xa23be97e3d5fd06e76e2d75c1bf09e7e9e04cd4b6a6d0aa0de3951cbf6bcb239",
-                    "nonce" : "0x075a422517057a00",
+                    "hash" : "0x07bc92fd000d507e5a350d7a4a2088ff905daa1d4dc6b13762955ff34262b5c2",
+                    "mixHash" : "0x38bfe0c9d087b8b31a98d1a822fca19a1307470babd6317e1d0813592717e945",
+                    "nonce" : "0x99372851294d9be2",
                     "number" : "0x01",
                     "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
                     "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a23be97e3d5fd06e76e2d75c1bf09e7e9e04cd4b6a6d0aa0de3951cbf6bcb23988075a422517057a00f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a038bfe0c9d087b8b31a98d1a822fca19a1307470babd6317e1d0813592717e9458899372851294d9be2f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9361b4f35d7db41af0490e1b08d146db0ac97324cfd7c33844090e9806a1e2e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x07bc92fd000d507e5a350d7a4a2088ff905daa1d4dc6b13762955ff34262b5c2",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALLCODE_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x467e698692724e0fff3d85448255c5251c12ebbad7fa66ca2c50ae82287f7119",
-                    "mixHash" : "0xd7d86a51cd76f8f9bc12801f259bcc393b157e9492cc28580fc37bde945f0b4b",
-                    "nonce" : "0xc8eeb5a4960b7239",
+                    "hash" : "0x0cadfa55b7d08321065b7f93ea8e34d47bbcd4b44c9123a13717705f322d381c",
+                    "mixHash" : "0x76b79c687df2133de003ace955d10ed0829f3d509334ed6273f49ac722635c65",
+                    "nonce" : "0xc8f5a9121212486b",
                     "number" : "0x01",
                     "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
                     "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d7d86a51cd76f8f9bc12801f259bcc393b157e9492cc28580fc37bde945f0b4b88c8eeb5a4960b7239f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a076b79c687df2133de003ace955d10ed0829f3d509334ed6273f49ac722635c6588c8f5a9121212486bf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x467e698692724e0fff3d85448255c5251c12ebbad7fa66ca2c50ae82287f7119",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0cadfa55b7d08321065b7f93ea8e34d47bbcd4b44c9123a13717705f322d381c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALLCODE_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xd007d3fe8a8b00cd02d7d55b9c1d79a3a7a062bb03883f7ea0170afa3e95aa0d",
-                    "mixHash" : "0x03ec24b4a44c922e56b9e2465ce8029fa86aafa9187c2004a56972b94a78d94a",
-                    "nonce" : "0x817407d286960756",
+                    "hash" : "0xc0a1839a45a525ca9ba37d873d033352b3ce92d83ddc7f6151bd3cd10f5264c8",
+                    "mixHash" : "0x6f27ee764c39ab003da5e2e2352c981da73584a1db35b23a5b53accff4246564",
+                    "nonce" : "0x33c603f362bd5e9b",
                     "number" : "0x01",
                     "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x6eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3c",
+                    "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
+                    "stateRoot" : "0x32b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eae311a811804421b2eb28cf9d9c05e7678172c5654904e9f7231a871b27e3ca0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a003ec24b4a44c922e56b9e2465ce8029fa86aafa9187c2004a56972b94a78d94a88817407d286960756f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a06f27ee764c39ab003da5e2e2352c981da73584a1db35b23a5b53accff42465648833c603f362bd5e9bf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd007d3fe8a8b00cd02d7d55b9c1d79a3a7a062bb03883f7ea0170afa3e95aa0d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc0a1839a45a525ca9ba37d873d033352b3ce92d83ddc7f6151bd3cd10f5264c8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALLCODE_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xce3ffad2cf49fd551cd11802b050e96b00fbaafbb296491ab553330ffd1a536b",
+                    "mixHash" : "0xd105467a84475e6e057a33a60c7108669bc21d48832f7029b35aad10e979c91b",
+                    "nonce" : "0x93c48d78c7312bb9",
+                    "number" : "0x01",
+                    "parentHash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
+                    "receiptTrie" : "0xe505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369",
+                    "stateRoot" : "0x32b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032b1491a4cc45d8b7487db0c5ef74061968b28f1a06d0bfcaa6c9812fea10cd6a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0e505b4780c36cbaa1c5e823cd9cc49140543377bf4485800915fdeb6717b6369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d105467a84475e6e057a33a60c7108669bc21d48832f7029b35aad10e979c91b8893c48d78c7312bb9f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3aa3895860d21daae66b0d3486684f3cf9134a5c259786c69d34bca184389896",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03931cc47c3183522d01c72f120c6830671f674c0c49ba4ea0709e80fe0054871a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xce3ffad2cf49fd551cd11802b050e96b00fbaafbb296491ab553330ffd1a536b",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0.json
index 8298b6f0d..e2195aba4 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x5607988d256a0a9cfeed7b2d297a326a2d831738e2d158540288ddf2912ff2a7",
-                    "mixHash" : "0x707a0dc55dba812583c962732fdc49931f59674e3a10d55aebc5dd78f0141304",
-                    "nonce" : "0x6d7328ee9870ca3e",
+                    "hash" : "0xb0bca1705134c86051e045697398f9230022513484d3916974fa8d0e65f88303",
+                    "mixHash" : "0x9a9966b42cced0711bb2345a73c89034ba4ee72c4313dfdd056e798daf25f12f",
+                    "nonce" : "0x03ba5dc7868a078e",
                     "number" : "0x01",
                     "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
-                    "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
-                    "stateRoot" : "0x890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1d",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0707a0dc55dba812583c962732fdc49931f59674e3a10d55aebc5dd78f0141304886d7328ee9870ca3ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a09a9966b42cced0711bb2345a73c89034ba4ee72c4313dfdd056e798daf25f12f8803ba5dc7868a078ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5607988d256a0a9cfeed7b2d297a326a2d831738e2d158540288ddf2912ff2a7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb0bca1705134c86051e045697398f9230022513484d3916974fa8d0e65f88303",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x10356e755b68757ce5ad0e9376389b377fb2166c7d30706c00d201328e0746cd",
-                    "mixHash" : "0xc0e21b801d0f52a7feb9c0a4f693afc3b2d426b84b902ccf06c0f083b76d53a7",
-                    "nonce" : "0x1306d29568661db0",
+                    "hash" : "0x5670816e181095a335d8fa914b780bca69146d1f976acbf1faed909244947454",
+                    "mixHash" : "0xf80f8c8c793151af7fea792ea65c6c203bd615290a396cca1daeba9d14c371a1",
+                    "nonce" : "0x091a336d48b94dda",
                     "number" : "0x01",
                     "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
-                    "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
-                    "stateRoot" : "0x890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1d",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c0e21b801d0f52a7feb9c0a4f693afc3b2d426b84b902ccf06c0f083b76d53a7881306d29568661db0f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f80f8c8c793151af7fea792ea65c6c203bd615290a396cca1daeba9d14c371a188091a336d48b94ddaf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10356e755b68757ce5ad0e9376389b377fb2166c7d30706c00d201328e0746cd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5670816e181095a335d8fa914b780bca69146d1f976acbf1faed909244947454",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x582b5616a34e97e488a1c10af1d7911b39968c2525ee146cd84a32d19c85a3a2",
-                    "mixHash" : "0x7515ed15e94df26d11c01d49a0360971a37345cb914d3c0eb88b3388ef4302f0",
-                    "nonce" : "0xa821f57634ad2c3f",
+                    "hash" : "0x4d22a851e38402f59917179211bb64b59604e079cd6bbb9ec1c74a18c6ea3806",
+                    "mixHash" : "0xd6830c2aa213f94cd2c322cdaa696a5e45e1f1f88c29de2545b528addf14e6b7",
+                    "nonce" : "0x57abea5e431fc09b",
                     "number" : "0x01",
                     "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
                     "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07515ed15e94df26d11c01d49a0360971a37345cb914d3c0eb88b3388ef4302f088a821f57634ad2c3ff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d6830c2aa213f94cd2c322cdaa696a5e45e1f1f88c29de2545b528addf14e6b78857abea5e431fc09bf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x582b5616a34e97e488a1c10af1d7911b39968c2525ee146cd84a32d19c85a3a2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4d22a851e38402f59917179211bb64b59604e079cd6bbb9ec1c74a18c6ea3806",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xa5187bd3434c041ea3fb1547c3309f22c699498501591513f9a3f1f418a34507",
-                    "mixHash" : "0xc1eff0bd047de71365574cea4d71a770ff7c69833bb56604dd0f9012de62123c",
-                    "nonce" : "0x8bb47e364c7abce0",
+                    "hash" : "0xfc56f24ee11847d4b130eda381a99662edb7fe9954f8d032ceb670b5712cc50f",
+                    "mixHash" : "0x5ed00b1b99050e0f9142a66812418135f66db5ce68a2915bf5c193abd556d43e",
+                    "nonce" : "0x53d108fd62aac526",
                     "number" : "0x01",
                     "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
                     "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c1eff0bd047de71365574cea4d71a770ff7c69833bb56604dd0f9012de62123c888bb47e364c7abce0f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a05ed00b1b99050e0f9142a66812418135f66db5ce68a2915bf5c193abd556d43e8853d108fd62aac526f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5187bd3434c041ea3fb1547c3309f22c699498501591513f9a3f1f418a34507",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfc56f24ee11847d4b130eda381a99662edb7fe9954f8d032ceb670b5712cc50f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x73592a92be8e54f9e239af91ac4b94b36a281c1523288c3b30b16ed10c07c9c0",
-                    "mixHash" : "0x5af95308a2ca12f440a8649e0b8be7ff3945160325bfeb67984ab770ff02289e",
-                    "nonce" : "0x8d651ac2c484683c",
+                    "hash" : "0x3a05c295dee8e17df8c839c7d22c0de76caea20693fe042d7d73609c5e6f04e0",
+                    "mixHash" : "0x4c478b1ba16f70d90d04db5d84ccba2568da6302aadf08d7c2c8eb4fa748c1f2",
+                    "nonce" : "0x5130d9feb8f6a4c6",
                     "number" : "0x01",
                     "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0xef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926",
+                    "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
+                    "stateRoot" : "0x890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef50f5e425e5b81041112437266aba350a112f4e1f342f947bc67fda23ee6926a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a05af95308a2ca12f440a8649e0b8be7ff3945160325bfeb67984ab770ff02289e888d651ac2c484683cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a04c478b1ba16f70d90d04db5d84ccba2568da6302aadf08d7c2c8eb4fa748c1f2885130d9feb8f6a4c6f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73592a92be8e54f9e239af91ac4b94b36a281c1523288c3b30b16ed10c07c9c0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3a05c295dee8e17df8c839c7d22c0de76caea20693fe042d7d73609c5e6f04e0",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x30f044da335e9ef9ab41f2651f156d79eb49654292325cb7e9590511eb06708b",
+                    "mixHash" : "0x689b980fe8c71025e5648d036e53a08849b2adcb55606017c4406c5949a0dacf",
+                    "nonce" : "0x54fe78e3da439bde",
+                    "number" : "0x01",
+                    "parentHash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
+                    "receiptTrie" : "0x592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0",
+                    "stateRoot" : "0x890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890a4b65e3d5191e977c3b9f1f72ef7af8f2bcc38851d54e87a6e46225a53e1da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0592e2fd56749ea404e585505d008a220d870ae80181ec5398b60615d62ed5ea0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0689b980fe8c71025e5648d036e53a08849b2adcb55606017c4406c5949a0dacf8854fe78e3da439bdef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcab70e7ac9ef3fe80e807b82a7289e30c26bfc4c6f56235a800a193f6be58e58",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a34b3b1cbd666b271196ed9267b2c46428ad7d8bf9d1406ba332c93507f48e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x30f044da335e9ef9ab41f2651f156d79eb49654292325cb7e9590511eb06708b",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0.json
index 98609cc98..55bd47864 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xfe6ccdb94ee4c2d3121d9d3fd71bb5ef180788ab815eff348d2716c14da49bd9",
-                    "mixHash" : "0x95291ff49f09f77fc2a60628772a27c53ba1e476a9bfb6fc1f08633c8d6cdf1c",
-                    "nonce" : "0x6e90607bda858a64",
+                    "hash" : "0x3dbbc08b5bf2de48a1cdf6bcf2a480bbe468530e2ff02fd885085c8236dfa0c3",
+                    "mixHash" : "0xe5f401a68b685646b2b8cd97acf5861b0f326563ad3b618cea65416dc688b18e",
+                    "nonce" : "0x748be7158fcf4113",
                     "number" : "0x01",
                     "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
-                    "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
-                    "stateRoot" : "0xdb4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x7dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a095291ff49f09f77fc2a60628772a27c53ba1e476a9bfb6fc1f08633c8d6cdf1c886e90607bda858a64f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cba0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0e5f401a68b685646b2b8cd97acf5861b0f326563ad3b618cea65416dc688b18e88748be7158fcf4113f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe6ccdb94ee4c2d3121d9d3fd71bb5ef180788ab815eff348d2716c14da49bd9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3dbbc08b5bf2de48a1cdf6bcf2a480bbe468530e2ff02fd885085c8236dfa0c3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x9ff3684e031b988e4b9e839b804c5a6ef1fa51baedf82cacd7814d6ccdbf43b5",
-                    "mixHash" : "0x53821ff084a21075024be323bc4d2747e5635d23bc23d33f6448d02d5ec3ceb5",
-                    "nonce" : "0x29209cc1e5f3c67a",
+                    "hash" : "0x0675b429f0957c2706e429c80a5d2bfbc292430db85bf1a774d6b2d9f4f2365a",
+                    "mixHash" : "0x3d609b8fb3bf94df6da6b843ffd7d156af4d628d5790e84095694b6e9baed5ee",
+                    "nonce" : "0xad1df0e3595de331",
                     "number" : "0x01",
                     "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
-                    "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
-                    "stateRoot" : "0xdb4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x7dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a053821ff084a21075024be323bc4d2747e5635d23bc23d33f6448d02d5ec3ceb58829209cc1e5f3c67af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cba0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a03d609b8fb3bf94df6da6b843ffd7d156af4d628d5790e84095694b6e9baed5ee88ad1df0e3595de331f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ff3684e031b988e4b9e839b804c5a6ef1fa51baedf82cacd7814d6ccdbf43b5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0675b429f0957c2706e429c80a5d2bfbc292430db85bf1a774d6b2d9f4f2365a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x01e8dc85d325dafd862699c2386b85940db355f429425e031381242cd1a90db5",
-                    "mixHash" : "0xb38061899cb6cc02ff0678ae20e395b75f6e85193008f6c21724b709ec935104",
-                    "nonce" : "0xb8e95ef11dd36d3f",
+                    "hash" : "0x8068f3fb2952019aee3301939c3040a7c18d16f9511eae20ec556fa83d5fba68",
+                    "mixHash" : "0x98ba444580f3c1391c9dc3f470a85fdddf574d4bbb860e8f5340d5b954ebe0ed",
+                    "nonce" : "0x5fcfe5d9ccecdc95",
                     "number" : "0x01",
                     "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
                     "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0b38061899cb6cc02ff0678ae20e395b75f6e85193008f6c21724b709ec93510488b8e95ef11dd36d3ff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a098ba444580f3c1391c9dc3f470a85fdddf574d4bbb860e8f5340d5b954ebe0ed885fcfe5d9ccecdc95f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01e8dc85d325dafd862699c2386b85940db355f429425e031381242cd1a90db5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8068f3fb2952019aee3301939c3040a7c18d16f9511eae20ec556fa83d5fba68",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xe95a364ce80506e4701752a42cc45cd7fab015b8fe33e5baa028528108d807dc",
-                    "mixHash" : "0x248fd838d058aa06e8b75ea77d560e68f1188b87c1f8193afb285b090cf40757",
-                    "nonce" : "0xdf1c8e8f780cdca3",
+                    "hash" : "0x4a619cf9fae24e4dd825051786385ac69c96def357910be53d8369c0fef78075",
+                    "mixHash" : "0xe7749d3552986a4bd9c8a85fd36e951b1e275a51052e2aa7b847ea03efcd7ac9",
+                    "nonce" : "0x8c8ce7e3447a8a51",
                     "number" : "0x01",
                     "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
                     "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0248fd838d058aa06e8b75ea77d560e68f1188b87c1f8193afb285b090cf4075788df1c8e8f780cdca3f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0e7749d3552986a4bd9c8a85fd36e951b1e275a51052e2aa7b847ea03efcd7ac9888c8ce7e3447a8a51f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe95a364ce80506e4701752a42cc45cd7fab015b8fe33e5baa028528108d807dc",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4a619cf9fae24e4dd825051786385ac69c96def357910be53d8369c0fef78075",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xa1f1f7707c69a970d1cc88292d8c124493e828382fbe310288ef9a1bb45fb85d",
-                    "mixHash" : "0xecdbb9d2774fa5e5baef7b85f34de74edf1adafeed06a6abc52d7409d98268d5",
-                    "nonce" : "0x487ca30a4e22b171",
+                    "hash" : "0xe3399e1841b0669d8d12bfa8fe89891e3edf00240a85785a2131d06908284a0f",
+                    "mixHash" : "0x850cdca6ccc263439818fe8b6dd96e11364438dd38dfe3c11e2a44b3fb69bc1d",
+                    "nonce" : "0x4e5a2f8e924f61b1",
                     "number" : "0x01",
                     "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x7dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cb",
+                    "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
+                    "stateRoot" : "0xdb4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dcde04afd7fb7387c0a5f9ddf1dfb7cc31bf13e86382efef92b30e05a5d48cba0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0ecdbb9d2774fa5e5baef7b85f34de74edf1adafeed06a6abc52d7409d98268d588487ca30a4e22b171f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0850cdca6ccc263439818fe8b6dd96e11364438dd38dfe3c11e2a44b3fb69bc1d884e5a2f8e924f61b1f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1f1f7707c69a970d1cc88292d8c124493e828382fbe310288ef9a1bb45fb85d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe3399e1841b0669d8d12bfa8fe89891e3edf00240a85785a2131d06908284a0f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xf4ee0b88ff61a3f9782b186362344e040bd006af4b0efd05a932120bdd2da11d",
+                    "mixHash" : "0xa816c6f5ffbb4bf1603f7890db5320f6e23310091f2b9cececa6dfd464aeaa43",
+                    "nonce" : "0x1e8431ea99b31e9a",
+                    "number" : "0x01",
+                    "parentHash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
+                    "receiptTrie" : "0x131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6",
+                    "stateRoot" : "0xdb4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a011b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4e0f34646e75bcd88d9215a2f89f1adc019481fc6eedded89fb616544056b3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0131b9afd2fae5cf4c8b10fc9e0c0614551928f6bd2880056a240021dc2df00f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a816c6f5ffbb4bf1603f7890db5320f6e23310091f2b9cececa6dfd464aeaa43881e8431ea99b31e9af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x11b94ae6fc37cfe600c0b0f652dc84bd8ccbf072826a3f546002e3119831cfd2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x70ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070ece460444136dbcdc0450da8748d4fc38ad30e2466913005c1fa12d07c652ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf4ee0b88ff61a3f9782b186362344e040bd006af4b0efd05a932120bdd2da11d",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0.json
index 78f312b6e..0e8bd8371 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xe042a3b7f156be2c98b4debec5ef88c657f9bdc3f083c63f9008bb2b8fc65411",
-                    "mixHash" : "0x58c6b7bf8824542eab47781cf1b0796b5e10b8211ea49767e9187953d96c6a73",
-                    "nonce" : "0xb69e93b67df802d9",
+                    "hash" : "0x7c0adcf5b89b129726b4446ce79864bec5306d195c3b32657683a7778839ab9f",
+                    "mixHash" : "0x510c7f37d5c3c705d2ed4c597deef1d471c302738f227208fd184ac376377381",
+                    "nonce" : "0xb80acee85988bc1c",
                     "number" : "0x01",
                     "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
-                    "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
-                    "stateRoot" : "0x2c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676d",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x4b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a058c6b7bf8824542eab47781cf1b0796b5e10b8211ea49767e9187953d96c6a7388b69e93b67df802d9f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0510c7f37d5c3c705d2ed4c597deef1d471c302738f227208fd184ac37637738188b80acee85988bc1cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe042a3b7f156be2c98b4debec5ef88c657f9bdc3f083c63f9008bb2b8fc65411",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7c0adcf5b89b129726b4446ce79864bec5306d195c3b32657683a7778839ab9f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x173a73b24456b5eeab3c54b7b3bfffbda74b869a3eeb0a28bb061ec0c74eb886",
-                    "mixHash" : "0x9875fe5487869abc47d3e30e7b2fd7b41844878bc99e9bec7ea484ce11d47a6e",
-                    "nonce" : "0x477f5f0f39d5a78a",
+                    "hash" : "0xb4eed1059bce862ca23a485403a779ac10e4e93fda271ee6747da9955e7e7f27",
+                    "mixHash" : "0x6890488fa46ea8840550760cb852d41c2dc1b928963563cceb8cf8b05ec96a5f",
+                    "nonce" : "0xe4983d1767e77cf4",
                     "number" : "0x01",
                     "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
-                    "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
-                    "stateRoot" : "0x2c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676d",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x4b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a09875fe5487869abc47d3e30e7b2fd7b41844878bc99e9bec7ea484ce11d47a6e88477f5f0f39d5a78af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a06890488fa46ea8840550760cb852d41c2dc1b928963563cceb8cf8b05ec96a5f88e4983d1767e77cf4f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x173a73b24456b5eeab3c54b7b3bfffbda74b869a3eeb0a28bb061ec0c74eb886",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb4eed1059bce862ca23a485403a779ac10e4e93fda271ee6747da9955e7e7f27",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xd64840ab94f3b8a3dfd0cebda20f255702b0da20834f96faa2b11db49dc48654",
-                    "mixHash" : "0xf493aadc5df802ef42b0121c6a9cbb5d34e1ec99e797d92145243e7dc581064f",
-                    "nonce" : "0xc7e9ac46337351bf",
+                    "hash" : "0x5f894d729b3aef222dcd148a2d94b7466f73aee39a13e95544fcf16b0e581153",
+                    "mixHash" : "0x58817bb72315e1801696a4ebeaee875ff82b3c29f105b228a5d03b7e227888f6",
+                    "nonce" : "0x212c6f3cb4d74538",
                     "number" : "0x01",
                     "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
                     "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f493aadc5df802ef42b0121c6a9cbb5d34e1ec99e797d92145243e7dc581064f88c7e9ac46337351bff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a058817bb72315e1801696a4ebeaee875ff82b3c29f105b228a5d03b7e227888f688212c6f3cb4d74538f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd64840ab94f3b8a3dfd0cebda20f255702b0da20834f96faa2b11db49dc48654",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5f894d729b3aef222dcd148a2d94b7466f73aee39a13e95544fcf16b0e581153",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +391,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xf0d40a62cf49c65cb8c9914ba1a4fcb5de8ccde9c6d3659dadcd5d223245e38c",
-                    "mixHash" : "0x740d8a9cee7a4a0dc57e1a1914754cb85f671bb75855e4c67169b52eb1d81040",
-                    "nonce" : "0xd2a0d40b90fb6e81",
+                    "hash" : "0xaa6e56c54108cd5d06e06e01b8255ed0df3c2441cbd23e12c04806e4dc8f0efc",
+                    "mixHash" : "0xc3b41ae99a73479edcd02c518f5af09b42f068b459a3274df51b89eeef5537b4",
+                    "nonce" : "0xede6f46f84519d48",
                     "number" : "0x01",
                     "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
                     "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
@@ -388,7 +402,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0740d8a9cee7a4a0dc57e1a1914754cb85f671bb75855e4c67169b52eb1d8104088d2a0d40b90fb6e81f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c3b41ae99a73479edcd02c518f5af09b42f068b459a3274df51b89eeef5537b488ede6f46f84519d48f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0d40a62cf49c65cb8c9914ba1a4fcb5de8ccde9c6d3659dadcd5d223245e38c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaa6e56c54108cd5d06e06e01b8255ed0df3c2441cbd23e12c04806e4dc8f0efc",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -483,10 +497,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x5d1db23a67d3f1d296824838fe04005f5c088b17c08098685297a8a8860a4cf5",
-                    "mixHash" : "0x8ff1a154df36f63df1239b8a5dd140feac83871c59341b8fc47bba0a178e1dc2",
-                    "nonce" : "0x1007aeadb489ee2c",
+                    "hash" : "0x5dbde8caf22409bcec9cd58b618b00f66d63c1ef70e99575ea341f4b0a655543",
+                    "mixHash" : "0x1ddf926b55930d856021be003e012a75f6489e06b81230a17db1e4bdd2780f2d",
+                    "nonce" : "0x5dd9b1135b6b859d",
                     "number" : "0x01",
                     "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x4b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887",
+                    "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
+                    "stateRoot" : "0x2c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b483f23dcc236d5d19a24b678f0a7409c728723b64b58a6b3ae1c8e4f128887a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08ff1a154df36f63df1239b8a5dd140feac83871c59341b8fc47bba0a178e1dc2881007aeadb489ee2cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a01ddf926b55930d856021be003e012a75f6489e06b81230a17db1e4bdd2780f2d885dd9b1135b6b859df862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d1db23a67d3f1d296824838fe04005f5c088b17c08098685297a8a8860a4cf5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5dbde8caf22409bcec9cd58b618b00f66d63c1ef70e99575ea341f4b0a655543",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x24418e831964458357b0997e6f533d97f60c8017791ae4cf59569555b5d9797d",
+                    "mixHash" : "0xf2a0ad5ae2d0523112767381027f9c0b5bf85327eeceade46b7d5b22b170ffd8",
+                    "nonce" : "0x4659242618ecce64",
+                    "number" : "0x01",
+                    "parentHash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
+                    "receiptTrie" : "0x1309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71b",
+                    "stateRoot" : "0x2c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c055f551d0a3ded51db81f6cd99eaded89de0220450b94e11acf640fe02676da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a01309156573ea26187dd3ac669d5e1e2eda929ca37530f98068fc33ec38bfd71bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f2a0ad5ae2d0523112767381027f9c0b5bf85327eeceade46b7d5b22b170ffd8884659242618ecce64f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa76c304ed1a5e80351da567f0b17a9e95266ba92c5dfc7b544371ad74c3cd253",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dfab04ecf7c6d08903d6ea0a50341799601439db44172ea7c225ada35c16e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24418e831964458357b0997e6f533d97f60c8017791ae4cf59569555b5d9797d",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0.json
index e8b41531f..eb79110ae 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALL_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x0343fe54f9e00c1595c67750161732f6ef233cb63fe4e89c3e044c05945d59a4",
-                    "mixHash" : "0xc4a07258f43e010d44865d2599d8a9ad411418465c84f93a1998156c7ff13a0c",
-                    "nonce" : "0xe5c23de7a07794e2",
+                    "hash" : "0x3ade391dfbb1738fdfc8a2889afc05913a42159d63e56d319d102b0abe3fa6ee",
+                    "mixHash" : "0x0dc6b75713c80325290ec24e264ffbdcbc4367bb5bb559681b9132b12a129ce9",
+                    "nonce" : "0x1a05b4caaa031c33",
                     "number" : "0x01",
                     "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
-                    "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
-                    "stateRoot" : "0x5e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x3fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c4a07258f43e010d44865d2599d8a9ad411418465c84f93a1998156c7ff13a0c88e5c23de7a07794e2f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00dc6b75713c80325290ec24e264ffbdcbc4367bb5bb559681b9132b12a129ce9881a05b4caaa031c33f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0343fe54f9e00c1595c67750161732f6ef233cb63fe4e89c3e044c05945d59a4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3ade391dfbb1738fdfc8a2889afc05913a42159d63e56d319d102b0abe3fa6ee",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "ZeroValue_CALL_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x1e2dbd68bbeced71e33220acc7ef1cae61eb7876eae3847b96514c37d62d6f36",
-                    "mixHash" : "0x4eb60e5404d4aaa92c6be67322ed4b71c886d62a62f3d0d3f62e1a643241fe68",
-                    "nonce" : "0x31a1e7a0d68c5e6e",
+                    "hash" : "0x1036e166b80a921886ad7258d87bc04f3f051074386308580f3c406d3f8020d8",
+                    "mixHash" : "0x0e1325271b76f7cc1fa26f010c53ebd60515c8fff8a38e86f9cc414fe52b9a05",
+                    "nonce" : "0x219d6d65ad2181ee",
                     "number" : "0x01",
                     "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
-                    "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
-                    "stateRoot" : "0x5e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x3fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a04eb60e5404d4aaa92c6be67322ed4b71c886d62a62f3d0d3f62e1a643241fe688831a1e7a0d68c5e6ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00e1325271b76f7cc1fa26f010c53ebd60515c8fff8a38e86f9cc414fe52b9a0588219d6d65ad2181eef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e2dbd68bbeced71e33220acc7ef1cae61eb7876eae3847b96514c37d62d6f36",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1036e166b80a921886ad7258d87bc04f3f051074386308580f3c406d3f8020d8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "ZeroValue_CALL_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x0666986e7546918396c8cfd87449a87d468d22fe87baa692e3c9cb3b681fc57d",
-                    "mixHash" : "0x0203069d9416dbc2c00d71313363089dac2e0dbbfc189767ec16922493fe1284",
-                    "nonce" : "0x86842731f2f6b21c",
+                    "hash" : "0x42f9b07acf55c5dd77e3afc53b34220821104e736cf0e8cc915408ad9f7f125d",
+                    "mixHash" : "0x339aae294c82fa258884ecfb7d80f3be5b74b35589d5c194a9cedb2dc6452fbb",
+                    "nonce" : "0xf17753d3f64601a7",
                     "number" : "0x01",
                     "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
                     "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00203069d9416dbc2c00d71313363089dac2e0dbbfc189767ec16922493fe12848886842731f2f6b21cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0339aae294c82fa258884ecfb7d80f3be5b74b35589d5c194a9cedb2dc6452fbb88f17753d3f64601a7f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0666986e7546918396c8cfd87449a87d468d22fe87baa692e3c9cb3b681fc57d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x42f9b07acf55c5dd77e3afc53b34220821104e736cf0e8cc915408ad9f7f125d",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "ZeroValue_CALL_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x3ee94b26de935ce2dc56b69968fb76e923f37f3be423c4fde30c23d02582e478",
-                    "mixHash" : "0x9e8d7543dbdc7ab183a75a24ef5b2a5b419c3271024980922c7b4af853f58484",
-                    "nonce" : "0x88b83ced7de35298",
+                    "hash" : "0x049a83441c6744ba3fdbf352f1db06ea5e26bae151c72cdf0ab4ba11fa66781e",
+                    "mixHash" : "0xc3b4c4b17683435ad6e2c1fe9eb2e0f5a7aea8bfbb7ba23b716710b022302918",
+                    "nonce" : "0xc345cf224af50534",
                     "number" : "0x01",
                     "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
                     "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a09e8d7543dbdc7ab183a75a24ef5b2a5b419c3271024980922c7b4af853f584848888b83ced7de35298f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c3b4c4b17683435ad6e2c1fe9eb2e0f5a7aea8bfbb7ba23b716710b02230291888c345cf224af50534f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ee94b26de935ce2dc56b69968fb76e923f37f3be423c4fde30c23d02582e478",
-        "network" : "Homestead",
+        "lastblockhash" : "0x049a83441c6744ba3fdbf352f1db06ea5e26bae151c72cdf0ab4ba11fa66781e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "ZeroValue_CALL_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xea901750b5c21325257d29de89c625d215713c4fbd037690ea6c0d048d8d5593",
-                    "mixHash" : "0x5d95d2bf817af971eb4f2ed8751e6f8cf93173160d02aec49b519d553f63123e",
-                    "nonce" : "0x490ace3a5a5e1091",
+                    "hash" : "0xea3d77ec71c88294329e4fa6838a67e77924ff034b58e9141201837c501305ca",
+                    "mixHash" : "0x3085aaabd58e6d03a52ed5e7ab752d689dc421a6ab9b239eaa2dd59d2322bc06",
+                    "nonce" : "0x6de9c3c952014372",
                     "number" : "0x01",
                     "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x3fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226",
+                    "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
+                    "stateRoot" : "0x5e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03fe3aadf498566190d08426eac66ec5cc9c53e598234d57b2605ac788fca1226a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a05d95d2bf817af971eb4f2ed8751e6f8cf93173160d02aec49b519d553f63123e88490ace3a5a5e1091f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a03085aaabd58e6d03a52ed5e7ab752d689dc421a6ab9b239eaa2dd59d2322bc06886de9c3c952014372f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea901750b5c21325257d29de89c625d215713c4fbd037690ea6c0d048d8d5593",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xea3d77ec71c88294329e4fa6838a67e77924ff034b58e9141201837c501305ca",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALL_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALL_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x489ce8a73411b53e79020fa6c39d97aa2b85f2c978b70828e17b21124abba1f9",
+                    "mixHash" : "0xa9027aa07b28cd8787dec02fdf681c755cb0e70b18913ae7428c7ca1880b9ddb",
+                    "nonce" : "0x96019d9f88c2851c",
+                    "number" : "0x01",
+                    "parentHash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
+                    "receiptTrie" : "0x9a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9",
+                    "stateRoot" : "0x5e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7eac8a2543972843a01f3eb06c6ead555a67e4e53f8e8f2a31bb3b4911a016a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a09a75a7e2f6e01fdbe43f6bb599af2dcdb08ce4c05ad9a91f9b9ddc0a95cd04e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a9027aa07b28cd8787dec02fdf681c755cb0e70b18913ae7428c7ca1880b9ddb8896019d9f88c2851cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0c665dc6499eb3bc76e1da2e66f1d74f4f2668e30136f8c25c5bbd192b89d91c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e1449fed6cc90cfa813cd68fc9fd135cae04b668c2d8b7c0c11650152e5aac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x489ce8a73411b53e79020fa6c39d97aa2b85f2c978b70828e17b21124abba1f9",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0.json
index cea825119..37e8aef54 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x56744ea3be597a347815562af11ad1747696e18f1f1e377962223fa3a9db1068",
-                    "mixHash" : "0x0a8cbc38929daafe80d5e2eb382c4f13b0d69df3f860bda93fa21dfc1be61b3d",
-                    "nonce" : "0xa4247aa6c1a41622",
+                    "hash" : "0xfc9df6a3bf92158643b82cb510a23796c6960d693349f2750834367d1caff093",
+                    "mixHash" : "0x8df33d90dc446eacc42d16c3d8d59952b550e502095fa68a63d6231910d3e648",
+                    "nonce" : "0xda2b491693e82f09",
                     "number" : "0x01",
                     "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
-                    "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
-                    "stateRoot" : "0x730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xa4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00a8cbc38929daafe80d5e2eb382c4f13b0d69df3f860bda93fa21dfc1be61b3d88a4247aa6c1a41622f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08df33d90dc446eacc42d16c3d8d59952b550e502095fa68a63d6231910d3e64888da2b491693e82f09f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56744ea3be597a347815562af11ad1747696e18f1f1e377962223fa3a9db1068",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfc9df6a3bf92158643b82cb510a23796c6960d693349f2750834367d1caff093",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x2ef1808e7f0dd2947e82f60f2e8e985bf5eda1cf5e1ac378f1b5fec7e3530438",
-                    "mixHash" : "0x7c2d8fba61cb0f541f423f0a5b57a6cb5d8349827580d906bcd47c284e739361",
-                    "nonce" : "0x5b2679d6e1554ddf",
+                    "hash" : "0x86f6ec9066e14ad336403494d1895c806ae0ed3340fe81430a1871339352f6da",
+                    "mixHash" : "0x3ba200695188b3efdd1040be077451c58bf6bda169039e4a49e26fe25eb8b9c3",
+                    "nonce" : "0x3789b8e3504dd1e3",
                     "number" : "0x01",
                     "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
-                    "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
-                    "stateRoot" : "0x730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xa4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07c2d8fba61cb0f541f423f0a5b57a6cb5d8349827580d906bcd47c284e739361885b2679d6e1554ddff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a03ba200695188b3efdd1040be077451c58bf6bda169039e4a49e26fe25eb8b9c3883789b8e3504dd1e3f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ef1808e7f0dd2947e82f60f2e8e985bf5eda1cf5e1ac378f1b5fec7e3530438",
-        "network" : "EIP158",
+        "lastblockhash" : "0x86f6ec9066e14ad336403494d1895c806ae0ed3340fe81430a1871339352f6da",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x01105fc69468be3b24cde9ac58980f7eec41b6f97531ca837d59ba9d86673c01",
-                    "mixHash" : "0x8f8761899fca6af0140cbb36ef5612d560987cb186934302346d3f4f3e67b6ff",
-                    "nonce" : "0x169501f190936807",
+                    "hash" : "0xe762e1218911affd3f7ae9a27adeb5af1f0d22c65342be89acb82f772fb34106",
+                    "mixHash" : "0x71a29fe67557b9130bdae74a7955dfa05713d2dbf025f4933e4623be11576144",
+                    "nonce" : "0x2ba3bc7fa4540b86",
                     "number" : "0x01",
                     "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
                     "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08f8761899fca6af0140cbb36ef5612d560987cb186934302346d3f4f3e67b6ff88169501f190936807f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a071a29fe67557b9130bdae74a7955dfa05713d2dbf025f4933e4623be11576144882ba3bc7fa4540b86f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01105fc69468be3b24cde9ac58980f7eec41b6f97531ca837d59ba9d86673c01",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe762e1218911affd3f7ae9a27adeb5af1f0d22c65342be89acb82f772fb34106",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x4477d67bda4fb2b038ddb18ed9f412ee6b9387e7ddfd1b0acee536712d4ada0c",
-                    "mixHash" : "0xcb9bb0edf048568b5c0eb2dfeb1e4b8210392590ff94c5e171b32dd91adafaf4",
-                    "nonce" : "0xb1db6d6fc3dfcf79",
+                    "hash" : "0x2290362e7128a44aee2d31663d3c4b011f60660347b82c0c4f007f8df6214b2f",
+                    "mixHash" : "0xa823a043c1378a18a4195b21f853c187ff20340589183ec2ff9342638c0bca0b",
+                    "nonce" : "0x5949f12c5c91eb93",
                     "number" : "0x01",
                     "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
                     "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0cb9bb0edf048568b5c0eb2dfeb1e4b8210392590ff94c5e171b32dd91adafaf488b1db6d6fc3dfcf79f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a823a043c1378a18a4195b21f853c187ff20340589183ec2ff9342638c0bca0b885949f12c5c91eb93f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4477d67bda4fb2b038ddb18ed9f412ee6b9387e7ddfd1b0acee536712d4ada0c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2290362e7128a44aee2d31663d3c4b011f60660347b82c0c4f007f8df6214b2f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x43c0ad6dc81a119f1d77db9682bc1a14ec4c9b86f159a6a0fea5f3ae5a1f9679",
-                    "mixHash" : "0xac3504fde26f5b6f45098a5ce0c2981359cce476cbdb9a0517c8c3e716b14f4f",
-                    "nonce" : "0x644f1c7e58389281",
+                    "hash" : "0x0bf1374118eef14cb1307c0ef619843afc46bb9071fd78ece340f892f9bb2570",
+                    "mixHash" : "0xa94b2d13354320e94008d3338e524b3a16dfec5b0fcd95ae4bc3c59186960032",
+                    "nonce" : "0x343be1a6f59fdb00",
                     "number" : "0x01",
                     "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0xa4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1",
+                    "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
+                    "stateRoot" : "0x730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4a82d6d1199a0fa6690b88b5c3fba4b940994ec3b4a80ea54f5e7e5a02cd4c1a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0ac3504fde26f5b6f45098a5ce0c2981359cce476cbdb9a0517c8c3e716b14f4f88644f1c7e58389281f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a94b2d13354320e94008d3338e524b3a16dfec5b0fcd95ae4bc3c5918696003288343be1a6f59fdb00f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43c0ad6dc81a119f1d77db9682bc1a14ec4c9b86f159a6a0fea5f3ae5a1f9679",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0bf1374118eef14cb1307c0ef619843afc46bb9071fd78ece340f892f9bb2570",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xeed2def360fc03f9ec5128d49e8c833b1a7f5d91b101bf39c293f664278ceaa9",
+                    "mixHash" : "0xab001f4d20b8f4eb15a49d14e7d05937a3f3479180142ad3bb19906b8a7f68ac",
+                    "nonce" : "0x7b77b98f0d0e21d9",
+                    "number" : "0x01",
+                    "parentHash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
+                    "receiptTrie" : "0xdbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096",
+                    "stateRoot" : "0x730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a052988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0730584665efab7ac455214594d79f95273aaed68b884f7985c2db1137e49ba44a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0dbb22b236464f7353b05ed39442fcd48fdedc280c8a5b43e07fe8915bd996096b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0ab001f4d20b8f4eb15a49d14e7d05937a3f3479180142ad3bb19906b8a7f68ac887b77b98f0d0e21d9f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x52988757e9635bd2d33912c3eaafae8e8ef8e0e1bd702d76d5ab9c3d5ad60250",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ad",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94802402f43f70db4abff31d7ef75b1b5cb334b93f1dab5f6089729354bd5ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeed2def360fc03f9ec5128d49e8c833b1a7f5d91b101bf39c293f664278ceaa9",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
index 090e8ff1a..ef388e208 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xde9127916676d7e4931fb5d07f9a229b4f8f339904b1a961975bb96904324d75",
-                    "mixHash" : "0xfed6f882ed866dae3760f89ba855369d242543fe7c971b83b73b019fe61bfc1f",
-                    "nonce" : "0xf249f3f1a7c98c7e",
+                    "hash" : "0xf942f4288326ee195c8d0a3a6584b1cc94d189c33af717a3b37d5e200fcce6b3",
+                    "mixHash" : "0x5f9bd6bf66733add0895434135c0373a4ca1552d082ac74fa4fbb15d8edbfeec",
+                    "nonce" : "0xd30c86b44095b8d4",
                     "number" : "0x01",
                     "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
-                    "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
-                    "stateRoot" : "0x7558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0fed6f882ed866dae3760f89ba855369d242543fe7c971b83b73b019fe61bfc1f88f249f3f1a7c98c7ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a05f9bd6bf66733add0895434135c0373a4ca1552d082ac74fa4fbb15d8edbfeec88d30c86b44095b8d4f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde9127916676d7e4931fb5d07f9a229b4f8f339904b1a961975bb96904324d75",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf942f4288326ee195c8d0a3a6584b1cc94d189c33af717a3b37d5e200fcce6b3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x56069eb40038c8219768fecc1c907df17076c973a321609b9ee1248fcf495850",
-                    "mixHash" : "0xd518c1c9e931075500238ea5838ce3b8795fd3eb373ada4676d695684ff914cb",
-                    "nonce" : "0x1aa6368821326bbe",
+                    "hash" : "0xa26872a35e711765aab56056c1bb68ba2ed4218e4cf02ec43287390215e9cdfe",
+                    "mixHash" : "0x16e659f6a72034f9e3a6366af589fe388f5d0c0087a48d87434ef3cb0e70d2f5",
+                    "nonce" : "0xd2041a7198f73caa",
                     "number" : "0x01",
                     "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
-                    "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
-                    "stateRoot" : "0x7558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d518c1c9e931075500238ea5838ce3b8795fd3eb373ada4676d695684ff914cb881aa6368821326bbef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a016e659f6a72034f9e3a6366af589fe388f5d0c0087a48d87434ef3cb0e70d2f588d2041a7198f73caaf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56069eb40038c8219768fecc1c907df17076c973a321609b9ee1248fcf495850",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa26872a35e711765aab56056c1bb68ba2ed4218e4cf02ec43287390215e9cdfe",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xdbd918263c46680d62f250de1f194a8d325e3375ecdd7715818f151c105bc2f4",
-                    "mixHash" : "0x0d8b0743f596656fc1b2d29a5e1c0ee918359c149154a3a5b9b6a9a3f45221d8",
-                    "nonce" : "0x7a818788338446fd",
+                    "hash" : "0x1cabd3daf636fd2d9d6e8c7bc2c1d98915a910aeab22daad2523b747970429ba",
+                    "mixHash" : "0x1420fa019786473302157526541e80175199da350d3c592a14fda923c056ab0f",
+                    "nonce" : "0x1db142e51c858911",
                     "number" : "0x01",
                     "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
                     "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00d8b0743f596656fc1b2d29a5e1c0ee918359c149154a3a5b9b6a9a3f45221d8887a818788338446fdf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a01420fa019786473302157526541e80175199da350d3c592a14fda923c056ab0f881db142e51c858911f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbd918263c46680d62f250de1f194a8d325e3375ecdd7715818f151c105bc2f4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1cabd3daf636fd2d9d6e8c7bc2c1d98915a910aeab22daad2523b747970429ba",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x59585947cfe2226ce0b77a8df7d7b3d2749e200fbce64c1264d1c15d8a477a17",
-                    "mixHash" : "0xd9c69996fbc14d904675755d408c4805662708408601a54521726cb4c04834b7",
-                    "nonce" : "0xf3ea48d21a86be5b",
+                    "hash" : "0xe57911e47768ff2271bfe349939dedfa3e69ab4a091724a3160e7d50def89637",
+                    "mixHash" : "0x0ea55f246822a19540e74d3778f34d2eb96ccfa5f9143886f40cd451c25b35e9",
+                    "nonce" : "0x6f5f768daed5395d",
                     "number" : "0x01",
                     "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
                     "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d9c69996fbc14d904675755d408c4805662708408601a54521726cb4c04834b788f3ea48d21a86be5bf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00ea55f246822a19540e74d3778f34d2eb96ccfa5f9143886f40cd451c25b35e9886f5f768daed5395df862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59585947cfe2226ce0b77a8df7d7b3d2749e200fbce64c1264d1c15d8a477a17",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe57911e47768ff2271bfe349939dedfa3e69ab4a091724a3160e7d50def89637",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x07a5dc542ca80e5241de77cde73688f50e5c3c64c0958f6ca51d6ea7c305f1a0",
-                    "mixHash" : "0x69879eb50515ab3b0a65f4fe7382a8763999f668513a489d153297727f55d8a8",
-                    "nonce" : "0x98d122ddc4f35c02",
+                    "hash" : "0x62fcf2571f65b53c1bbb6873cbdbc0a8dc28d6a519f1f95209c2b8e7c870a323",
+                    "mixHash" : "0x62f805c7609379ab5554d41de9de44a727a7bee2e5c2641a45f5985cbb32f427",
+                    "nonce" : "0x5eb6fae4e04d3e26",
                     "number" : "0x01",
                     "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21",
+                    "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
+                    "stateRoot" : "0x7558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0511b8f030fa8ccd6f518e5f9eb092461c02cfa242d1fa8cb069dbf3b95cced21a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a069879eb50515ab3b0a65f4fe7382a8763999f668513a489d153297727f55d8a88898d122ddc4f35c02f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a062f805c7609379ab5554d41de9de44a727a7bee2e5c2641a45f5985cbb32f427885eb6fae4e04d3e26f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07a5dc542ca80e5241de77cde73688f50e5c3c64c0958f6ca51d6ea7c305f1a0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x62fcf2571f65b53c1bbb6873cbdbc0a8dc28d6a519f1f95209c2b8e7c870a323",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x59c56b819d8edb752d54f3ec03487f2476c947e2e1f029c9a9eb645fe9fa8243",
+                    "mixHash" : "0xa93c86d3d6c0cc0b7538356f7da4d54a78f5b3c0948787fd4f22f26b7a3db395",
+                    "nonce" : "0xd0993b3a5c48db25",
+                    "number" : "0x01",
+                    "parentHash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
+                    "receiptTrie" : "0x66594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063",
+                    "stateRoot" : "0x7558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0d2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07558df7259999695e332be141a7cccbef43755f3b7bf4e378709a2a5d9a1f488a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a066594223f313258282b7fff30b7629ca72ad3867651f4c8c952afb7ec49b2063b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a93c86d3d6c0cc0b7538356f7da4d54a78f5b3c0948787fd4f22f26b7a3db39588d0993b3a5c48db25f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd2899d90e3978051eac3507231298e65c670e83f01a63a575af63d09e28ad86d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08ef",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c2cda2a245949a00692f6adb66651ac1d630e9aac2d106234d70ea6da0e08efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x59c56b819d8edb752d54f3ec03487f2476c947e2e1f029c9a9eb645fe9fa8243",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0.json
index 263d287a3..b700c40ac 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x997e24ee77b26a8ebc137a48843eb1213bae7463deae21d1deda0f31a8cfc438",
-                    "mixHash" : "0x36149cbda7bdea06d30bd53b4d65cdf00a7747b9bd6e27822ff55fb49c6c2323",
-                    "nonce" : "0xceadfb1fa1fe745e",
+                    "hash" : "0x5daa84d9d73637a75ac7f990d5416db85009db340b862831aed335816c65e8c9",
+                    "mixHash" : "0xbec8e64727748b8eda71238484e86865f82ef5aeb6f476e0e09e5c5ad838bb8c",
+                    "nonce" : "0x2c6bd44106421736",
                     "number" : "0x01",
                     "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
-                    "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
-                    "stateRoot" : "0x6318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x0f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a036149cbda7bdea06d30bd53b4d65cdf00a7747b9bd6e27822ff55fb49c6c232388ceadfb1fa1fe745ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0bec8e64727748b8eda71238484e86865f82ef5aeb6f476e0e09e5c5ad838bb8c882c6bd44106421736f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x997e24ee77b26a8ebc137a48843eb1213bae7463deae21d1deda0f31a8cfc438",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5daa84d9d73637a75ac7f990d5416db85009db340b862831aed335816c65e8c9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x7d1c74ba177ecbe832f0f63f9c2753be4161ff41347980fa554fa375c277c25a",
-                    "mixHash" : "0x6176b27cb4b0311697c0f9e6b0aeee1c1f763588888bc8ebfec0464e38c7145b",
-                    "nonce" : "0xd653ceb762cbbb45",
+                    "hash" : "0x214fa7d62dc79320f0ef7ec9f88eaffa66788ecef876ad700358658cdae1831a",
+                    "mixHash" : "0x7819b0d27d4f061d71db7be9ecee20b68321c77c428574c121febab55edc2033",
+                    "nonce" : "0x719fc5f1e091cdba",
                     "number" : "0x01",
                     "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
-                    "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
-                    "stateRoot" : "0x6318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x0f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a06176b27cb4b0311697c0f9e6b0aeee1c1f763588888bc8ebfec0464e38c7145b88d653ceb762cbbb45f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07819b0d27d4f061d71db7be9ecee20b68321c77c428574c121febab55edc203388719fc5f1e091cdbaf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d1c74ba177ecbe832f0f63f9c2753be4161ff41347980fa554fa375c277c25a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x214fa7d62dc79320f0ef7ec9f88eaffa66788ecef876ad700358658cdae1831a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xb0b6942a466fd96e1eb464113a73de94782ff0a286c56af5add63f8733eef794",
-                    "mixHash" : "0x6ecf1c9d56a678a0259dcecb5caa38e463543aa617f0f5ef23cbb82c4dd21872",
-                    "nonce" : "0xaacc8e8fa23aa99a",
+                    "hash" : "0x9065ffef887213c624085d83e9206ee0066d888bb545e3e01dacc66737f1e121",
+                    "mixHash" : "0xbde7de810be6dc375e0060844a3d99aaf7792b40004fb08eaa0bd06f2511518d",
+                    "nonce" : "0x1054666d16949d47",
                     "number" : "0x01",
                     "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
                     "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a06ecf1c9d56a678a0259dcecb5caa38e463543aa617f0f5ef23cbb82c4dd2187288aacc8e8fa23aa99af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0bde7de810be6dc375e0060844a3d99aaf7792b40004fb08eaa0bd06f2511518d881054666d16949d47f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0b6942a466fd96e1eb464113a73de94782ff0a286c56af5add63f8733eef794",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9065ffef887213c624085d83e9206ee0066d888bb545e3e01dacc66737f1e121",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +391,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x48f6d63792bc09cc70c3bfb7aaefec8938a45abc1eadc660dd542ee99f9bfb25",
-                    "mixHash" : "0xd754cf366c30ee3fd4932fca7dd38b32acdbfd77fb84745b42347c43f5fb5be8",
-                    "nonce" : "0xceb039888e67a65f",
+                    "hash" : "0xc40f14a8c3bf784d647388caafd3f2d09878d5d95c9be32f39b18b28437a48e7",
+                    "mixHash" : "0x27a711a0abe1e45626aaa8a0abe4d8bd81c79c01791f9bbd223a44b98f4ce793",
+                    "nonce" : "0x14d717d11aa2f772",
                     "number" : "0x01",
                     "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
                     "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
@@ -388,7 +402,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d754cf366c30ee3fd4932fca7dd38b32acdbfd77fb84745b42347c43f5fb5be888ceb039888e67a65ff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a027a711a0abe1e45626aaa8a0abe4d8bd81c79c01791f9bbd223a44b98f4ce7938814d717d11aa2f772f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48f6d63792bc09cc70c3bfb7aaefec8938a45abc1eadc660dd542ee99f9bfb25",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc40f14a8c3bf784d647388caafd3f2d09878d5d95c9be32f39b18b28437a48e7",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -483,10 +497,10 @@
             }
         }
     },
-    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x1fd3db27c184235149c2bd255c85a21fae0b375d78abc1ce4decef5866d3458d",
-                    "mixHash" : "0x8f85f9095a27760b0da8fdb5840cecb3997a518a00fe10655008be8b070cdd45",
-                    "nonce" : "0x7150cf693dbcb170",
+                    "hash" : "0xa2e2655e70b22827b5edb959173d0cfa61f1c2f1d61723dfc7ff19faaa3d3783",
+                    "mixHash" : "0x0f0ca3d729a174303b8862d5e043712a9fe74abf96a75027a23414248cd31f7f",
+                    "nonce" : "0xcf75d812600dcf5c",
                     "number" : "0x01",
                     "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x0f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8",
+                    "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
+                    "stateRoot" : "0x6318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f8051bbf45dd2d2c4ebeeb9f520b3ac31b4f2dd378930c90c7beeabf18e57d8a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08f85f9095a27760b0da8fdb5840cecb3997a518a00fe10655008be8b070cdd45887150cf693dbcb170f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00f0ca3d729a174303b8862d5e043712a9fe74abf96a75027a23414248cd31f7f88cf75d812600dcf5cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fd3db27c184235149c2bd255c85a21fae0b375d78abc1ce4decef5866d3458d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa2e2655e70b22827b5edb959173d0cfa61f1c2f1d61723dfc7ff19faaa3d3783",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xb77089693eeb712fc1a0a8947ae3eca2f5e1062bf98233becdedcadcaa29349f",
+                    "mixHash" : "0x8ad943f81b298a6440574a543c4ba22dc15028eca8b0fe55bc53a860dcfdbfa6",
+                    "nonce" : "0x67fa423f4c4e8c33",
+                    "number" : "0x01",
+                    "parentHash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
+                    "receiptTrie" : "0x4bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322",
+                    "stateRoot" : "0x6318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06318f4e949a985e008a18d8b9f8b23992a60a201e6913d1fd6dde67d6c5afb12a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a04bb4a7478301d6f2d84f7a8f84451f4c951c607ce32f867cb4e3025f96c10322b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08ad943f81b298a6440574a543c4ba22dc15028eca8b0fe55bc53a860dcfdbfa68867fa423f4c4e8c33f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x110a9ce672e867d8fde5fb0fd2c9f259d583fab410f895437c4ce8f7c09c976b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0455872bacc1fea04bcdf57f7fb2cac14f217b1fe5acfcb200a22c88085367692a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb77089693eeb712fc1a0a8947ae3eca2f5e1062bf98233becdedcadcaa29349f",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0.json
index 41c3750c8..cbbd6f138 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_DELEGATECALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x8b559ee404722e22a64c371b15c0dfd326f2b15cea63c8bfb6867319c9f8afc3",
-                    "mixHash" : "0xf59f3297a121db9e718543e28f6d403b3ef5576bf1ce7594048a378c42065f63",
-                    "nonce" : "0x2afea1ee2e90c195",
+                    "hash" : "0xb70b7ce8511dbc280e3b2afc18dcb68eac13e240e0077e4a4f418cd9d391f6ae",
+                    "mixHash" : "0x1ea046e0d3086f53dd4d1da987b99a00c2a6a9ebb000d3fb9e9471c52a98e463",
+                    "nonce" : "0x9cf458e4167edbb9",
                     "number" : "0x01",
                     "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
-                    "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
-                    "stateRoot" : "0x55c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xe5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f59f3297a121db9e718543e28f6d403b3ef5576bf1ce7594048a378c42065f63882afea1ee2e90c195f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a01ea046e0d3086f53dd4d1da987b99a00c2a6a9ebb000d3fb9e9471c52a98e463889cf458e4167edbb9f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b559ee404722e22a64c371b15c0dfd326f2b15cea63c8bfb6867319c9f8afc3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb70b7ce8511dbc280e3b2afc18dcb68eac13e240e0077e4a4f418cd9d391f6ae",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_DELEGATECALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x46bd356dbc58199760bc0e9aa99cf33b814257ba1cfb1f143a9fd76ac4a2cff5",
-                    "mixHash" : "0x2ca5ed18f9cba1ee80a839d90763ee71cce0758c19b68eba05fe33d4e22519f5",
-                    "nonce" : "0x24ac400f443e38e8",
+                    "hash" : "0xb1a567121ee682e6257ff02ec3dc8ea32efbe61c950c15af72524c795f9cae53",
+                    "mixHash" : "0x95ccad4c8781e34a5af3aa73bc441d8f19851d441fe3175684dbbc2ad0fe4a26",
+                    "nonce" : "0x90f6f7243d3b2473",
                     "number" : "0x01",
                     "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
-                    "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
-                    "stateRoot" : "0x55c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0xe5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a02ca5ed18f9cba1ee80a839d90763ee71cce0758c19b68eba05fe33d4e22519f58824ac400f443e38e8f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a095ccad4c8781e34a5af3aa73bc441d8f19851d441fe3175684dbbc2ad0fe4a268890f6f7243d3b2473f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46bd356dbc58199760bc0e9aa99cf33b814257ba1cfb1f143a9fd76ac4a2cff5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb1a567121ee682e6257ff02ec3dc8ea32efbe61c950c15af72524c795f9cae53",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_DELEGATECALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xcfb2d10b59df4c467256f774c667d09339ccd857c67c86891ba6f1eb9c0efc11",
-                    "mixHash" : "0x5bc1d7d35167271d41309b8a9320886ef67ba93f2f12e465ec7625872d195a3d",
-                    "nonce" : "0x26bdda29fa9e10e8",
+                    "hash" : "0x03d1d5f719a488321c75fdea274691d22646e7f2d22e5de469be9a82217a6f75",
+                    "mixHash" : "0xe105733c0f2160d47db7353b7bf395312d28e6553c6af247f2c6da315e9c03eb",
+                    "nonce" : "0xe1f36a2163659c41",
                     "number" : "0x01",
                     "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
                     "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a05bc1d7d35167271d41309b8a9320886ef67ba93f2f12e465ec7625872d195a3d8826bdda29fa9e10e8f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0e105733c0f2160d47db7353b7bf395312d28e6553c6af247f2c6da315e9c03eb88e1f36a2163659c41f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb2d10b59df4c467256f774c667d09339ccd857c67c86891ba6f1eb9c0efc11",
-        "network" : "Frontier",
+        "lastblockhash" : "0x03d1d5f719a488321c75fdea274691d22646e7f2d22e5de469be9a82217a6f75",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_DELEGATECALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x5f42458df401efcc5f24f2107861f8bb9b084b551fd505766cf016d3da39a039",
-                    "mixHash" : "0x991f8022dd40a29479424f312abb24741131aadadddbc113223f47de3264872f",
-                    "nonce" : "0x37cca623db91c041",
+                    "hash" : "0x0209e7a8b4d63da9e9b8938d0141ab75a052e4682d5f803635902fb187948949",
+                    "mixHash" : "0x7e9d54a4fbec629267558f3e76dab2de3a203fd6fe5373ddf719880275a45aa2",
+                    "nonce" : "0x7270abbd4ff59f4a",
                     "number" : "0x01",
                     "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
                     "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0991f8022dd40a29479424f312abb24741131aadadddbc113223f47de3264872f8837cca623db91c041f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07e9d54a4fbec629267558f3e76dab2de3a203fd6fe5373ddf719880275a45aa2887270abbd4ff59f4af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f42458df401efcc5f24f2107861f8bb9b084b551fd505766cf016d3da39a039",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0209e7a8b4d63da9e9b8938d0141ab75a052e4682d5f803635902fb187948949",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_DELEGATECALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x35742a0995f164411199799c991902494be65f9506455f4e33eecaaab0a6f34c",
-                    "mixHash" : "0xa703acd7c2553f33e5e5459f45cb7c500f090f43503002e58cf87ebebf683801",
-                    "nonce" : "0xc72e8ec1f39c3490",
+                    "hash" : "0x48e15d464f4b144e6dd07f5510827579ddff0a20369167145778c038fb08c6ff",
+                    "mixHash" : "0xd0ba9a58b0d9e90e2725a42f017781b014f01b2b429708a1d8cae5c760c7e210",
+                    "nonce" : "0xbba889aefe6c8b8a",
                     "number" : "0x01",
                     "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0xe5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4",
+                    "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
+                    "stateRoot" : "0x55c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5243eeb4280085b4ffe043db85914b0a175e7278162a80e6fd85ca9449194c4a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a703acd7c2553f33e5e5459f45cb7c500f090f43503002e58cf87ebebf68380188c72e8ec1f39c3490f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d0ba9a58b0d9e90e2725a42f017781b014f01b2b429708a1d8cae5c760c7e21088bba889aefe6c8b8af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35742a0995f164411199799c991902494be65f9506455f4e33eecaaab0a6f34c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x48e15d464f4b144e6dd07f5510827579ddff0a20369167145778c038fb08c6ff",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_DELEGATECALL_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xedc2b3bf780c402e55e0cd8250bb24418780d6f9880a6c47f7b89bf5f8db8179",
+                    "mixHash" : "0x1c1cd4f5a622a3d529f1f26aa935083c29dc948c487c8c02474d7ff59c9b3e16",
+                    "nonce" : "0x758d224c8fe8e468",
+                    "number" : "0x01",
+                    "parentHash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
+                    "receiptTrie" : "0xb1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420",
+                    "stateRoot" : "0x55c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055c3a6e241d19405451c9698fe3cd56c46b42fe5b770f60775d4f4450454dc03a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0b1157470b297566e71afaeba013702385366419b1ec126f41a8644ad95525420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a01c1cd4f5a622a3d529f1f26aa935083c29dc948c487c8c02474d7ff59c9b3e1688758d224c8fe8e468f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8437557a881bf7f6e8a5d517e6edce26d2a4035d348fd957db63e13c3d10313e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d16e7ff027dd88dc2415567e9c4b3354ff7936358540c2c6b6d2796a4241136a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xedc2b3bf780c402e55e0cd8250bb24418780d6f9880a6c47f7b89bf5f8db8179",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0.json
index e09402284..29ebd430d 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x4da0adb39b5ef6c2be164c6effc42c38281bd1dbfc30dcea2e672b38ed807f09",
-                    "mixHash" : "0x9ba185fd6618426a3acc59c3b0b7a236e8c3753b0805527ebd5f7b0f380b2b37",
-                    "nonce" : "0x2ad41160ab558aee",
+                    "hash" : "0x7ff11b2a4d95ccbbca1bc973a5db8663fdc47e5ddcfe04aed1db6642a8829b3b",
+                    "mixHash" : "0xf0c63ca62d2af9b4ccd6980326c7291efaaa9a9f1b98833616586c016b7e0375",
+                    "nonce" : "0xe121ae536d4b06d8",
                     "number" : "0x01",
                     "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
-                    "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
-                    "stateRoot" : "0x53092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ad",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x56d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a09ba185fd6618426a3acc59c3b0b7a236e8c3753b0805527ebd5f7b0f380b2b37882ad41160ab558aeef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f0c63ca62d2af9b4ccd6980326c7291efaaa9a9f1b98833616586c016b7e037588e121ae536d4b06d8f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4da0adb39b5ef6c2be164c6effc42c38281bd1dbfc30dcea2e672b38ed807f09",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7ff11b2a4d95ccbbca1bc973a5db8663fdc47e5ddcfe04aed1db6642a8829b3b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x65e9d37654c7533d7726a3b2ba98b68c6579a9f56667d3713b3c353db4803fab",
-                    "mixHash" : "0x8f5c789d53daac0c56ac120107532a9e56123fc7b7b24054b848b80b3b5e06dd",
-                    "nonce" : "0x91177b1ad8de8c0e",
+                    "hash" : "0xb838e086c46ab5820a57b6f6d216e75d60d8383fdc014016d0b0309ee243dcc5",
+                    "mixHash" : "0xbafa0a609b661157ca2cf08edcd8bf6068b44abc4c14ca05035b22f81920debe",
+                    "nonce" : "0xb8dc13c95d4def92",
                     "number" : "0x01",
                     "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
-                    "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
-                    "stateRoot" : "0x53092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ad",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x56d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08f5c789d53daac0c56ac120107532a9e56123fc7b7b24054b848b80b3b5e06dd8891177b1ad8de8c0ef862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0bafa0a609b661157ca2cf08edcd8bf6068b44abc4c14ca05035b22f81920debe88b8dc13c95d4def92f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65e9d37654c7533d7726a3b2ba98b68c6579a9f56667d3713b3c353db4803fab",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb838e086c46ab5820a57b6f6d216e75d60d8383fdc014016d0b0309ee243dcc5",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x8ebc09c3509bad037543dbaf3bb5661278e219bd3b06f37699e1c8fa1ec43d3a",
-                    "mixHash" : "0xfaa1fd856153728f2dcd0bc47f1f80bc4032025224c35dd128dca9368f12b157",
-                    "nonce" : "0xcc63a4f429aed6a0",
+                    "hash" : "0x6552e65ce4fa4de25055ed0be1bfdac186d3b0e42f70665b4eb8589f14137c6c",
+                    "mixHash" : "0xb36f976b7fb1c717888409f73706e22cfa87f6cc02147970af7296df39d62818",
+                    "nonce" : "0xc41aecc37dcbc13d",
                     "number" : "0x01",
                     "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
                     "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0faa1fd856153728f2dcd0bc47f1f80bc4032025224c35dd128dca9368f12b15788cc63a4f429aed6a0f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0b36f976b7fb1c717888409f73706e22cfa87f6cc02147970af7296df39d6281888c41aecc37dcbc13df862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ebc09c3509bad037543dbaf3bb5661278e219bd3b06f37699e1c8fa1ec43d3a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6552e65ce4fa4de25055ed0be1bfdac186d3b0e42f70665b4eb8589f14137c6c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x5cd9b1fc06c70090d2d66cdfffba9658ebf9209eb48866dd08d99ee81a9c90f0",
-                    "mixHash" : "0xc2ab478492aa4f3d365ae0565fc9686fd6a1b19e4a618104d286b713d731227c",
-                    "nonce" : "0xf3fa6b07954e1062",
+                    "hash" : "0x795b1f930ee81ef3aeb0b745b0941766ec6234ce84e4c43009413ddaafde264c",
+                    "mixHash" : "0x803cffdfed6fb3e1e5a748a6f05b18b19f997fc8809496f0575caf23af8ee4e7",
+                    "nonce" : "0x065c4cc1364bf5c5",
                     "number" : "0x01",
                     "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
                     "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c2ab478492aa4f3d365ae0565fc9686fd6a1b19e4a618104d286b713d731227c88f3fa6b07954e1062f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0803cffdfed6fb3e1e5a748a6f05b18b19f997fc8809496f0575caf23af8ee4e788065c4cc1364bf5c5f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cd9b1fc06c70090d2d66cdfffba9658ebf9209eb48866dd08d99ee81a9c90f0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x795b1f930ee81ef3aeb0b745b0941766ec6234ce84e4c43009413ddaafde264c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x643271390a5d8bb9e92acebb2a9a586881075ea9f9f7bd4468ecf91d8a19b634",
-                    "mixHash" : "0x021a68408081568ae7ad14f5db6000540055847512f0fdefbac4874ccfd73830",
-                    "nonce" : "0xe62d003d3f0f89cb",
+                    "hash" : "0x4cc34e3e916bd09be868b5393493f0cf889d2874098c40735bae038bf4c5a1d4",
+                    "mixHash" : "0x7eb5e9e82f8ea87ff06d3cf163450953cf571007768d2103b3d0dace2a200e4a",
+                    "nonce" : "0x3c133d43f5b26eb5",
                     "number" : "0x01",
                     "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x56d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380",
+                    "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
+                    "stateRoot" : "0x53092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9bd52d372ea65829a9848f0ed59e2b0a484182c0f7922a61983f66371c380a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0021a68408081568ae7ad14f5db6000540055847512f0fdefbac4874ccfd7383088e62d003d3f0f89cbf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07eb5e9e82f8ea87ff06d3cf163450953cf571007768d2103b3d0dace2a200e4a883c133d43f5b26eb5f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x643271390a5d8bb9e92acebb2a9a586881075ea9f9f7bd4468ecf91d8a19b634",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4cc34e3e916bd09be868b5393493f0cf889d2874098c40735bae038bf4c5a1d4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x4be0c2413d85ca005034117e0c018236cf68081c231976aee305fb0126c039ac",
+                    "mixHash" : "0x61f9dfd3d2c3e5f15eafbed14f7e55836ea32c83289fcfede9a94818ebe9d15e",
+                    "nonce" : "0x6c49d0274000c4a1",
+                    "number" : "0x01",
+                    "parentHash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
+                    "receiptTrie" : "0xbbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775",
+                    "stateRoot" : "0x53092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053092aabe7f8efe70e6ae7311fa75a77f6ef94da49969e1dfb154dba1554d4ada0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0bbe199879c1168d05343cf0dc12be46fc0b5c98901bafea32c360f07ab33c775b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a061f9dfd3d2c3e5f15eafbed14f7e55836ea32c83289fcfede9a94818ebe9d15e886c49d0274000c4a1f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0d650587ed8486e070cdcccc33570c8624c098daef009b85aa25ed31ad9e479a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdf82a0e576c807f7470ea311ab50f993e46874acdabdfc8d74eb7b0a88dbcaca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4be0c2413d85ca005034117e0c018236cf68081c231976aee305fb0126c039ac",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
index 85b3989fb..cd292cd1f 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xca2e98500a90a90df65271c68e08d9236ee7091db99d237eafe669b8b651102a",
-                    "mixHash" : "0x77cf6023de00d24c60532cbaa27c2fa35b2800712374c95ecddd78312b652d7b",
-                    "nonce" : "0xb6426fb7a85021a2",
+                    "hash" : "0xba06f33199b98d44eacf91303e2d957408f58d10cc80289810b204623c334642",
+                    "mixHash" : "0x8396b3717a666ca5fed396f8cdebbac9c162d27aad4453ae47a1959156f9e450",
+                    "nonce" : "0x16b570600a6e2d15",
                     "number" : "0x01",
                     "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
-                    "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
-                    "stateRoot" : "0x5a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x92d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a077cf6023de00d24c60532cbaa27c2fa35b2800712374c95ecddd78312b652d7b88b6426fb7a85021a2f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08396b3717a666ca5fed396f8cdebbac9c162d27aad4453ae47a1959156f9e4508816b570600a6e2d15f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca2e98500a90a90df65271c68e08d9236ee7091db99d237eafe669b8b651102a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xba06f33199b98d44eacf91303e2d957408f58d10cc80289810b204623c334642",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x090f70fc37e26db869eb00b90cedebaecf65466a0b2383079aa2823086171fcd",
-                    "mixHash" : "0xf171ace78ed50cd9f654bc610c3014f74c539ad9771074fa561d273696f1ceca",
-                    "nonce" : "0xb6527873afae7ea6",
+                    "hash" : "0x11d19d1f7016259c0586ec5b85dcbfba9c09e82020792320492ee26b1bf3a874",
+                    "mixHash" : "0x6d4ff04267766ef5f7ce77681545906ec2cbf97c99590203db7bb55c99c09a26",
+                    "nonce" : "0xdc18656fb1429d30",
                     "number" : "0x01",
                     "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
-                    "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
-                    "stateRoot" : "0x5a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x92d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f171ace78ed50cd9f654bc610c3014f74c539ad9771074fa561d273696f1ceca88b6527873afae7ea6f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a06d4ff04267766ef5f7ce77681545906ec2cbf97c99590203db7bb55c99c09a2688dc18656fb1429d30f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x090f70fc37e26db869eb00b90cedebaecf65466a0b2383079aa2823086171fcd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x11d19d1f7016259c0586ec5b85dcbfba9c09e82020792320492ee26b1bf3a874",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x11469ac93fc3e6a817882ebe41c0e61fa85b347c1aeac63df947ac37fd9f984e",
-                    "mixHash" : "0xd3268779ce7c1269e2ec98d255a46be495442310804f76f3b97fa7d65c269aa6",
-                    "nonce" : "0x000eee7303bb2691",
+                    "hash" : "0xf2e55d0708da32c2d3318e9546059731ff24644ff06fc544788a51cb15105f8c",
+                    "mixHash" : "0x0ee281a2407f7c0bd96472ef959b5272e1037f48d2c433200defbd03568f521b",
+                    "nonce" : "0x2570075a477a566a",
                     "number" : "0x01",
                     "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
                     "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0d3268779ce7c1269e2ec98d255a46be495442310804f76f3b97fa7d65c269aa688000eee7303bb2691f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a00ee281a2407f7c0bd96472ef959b5272e1037f48d2c433200defbd03568f521b882570075a477a566af862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11469ac93fc3e6a817882ebe41c0e61fa85b347c1aeac63df947ac37fd9f984e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf2e55d0708da32c2d3318e9546059731ff24644ff06fc544788a51cb15105f8c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x518b9d88be2226972f6fa485307b401b30f067152812a1ab25c92e308e95a0a0",
-                    "mixHash" : "0x7316d2347ea807ee6caae26ee8d8da9c763351a2b6e58f51bdab9efc7b68d7bd",
-                    "nonce" : "0xe952a997e2992d7c",
+                    "hash" : "0xa503acab1c85b36e1f880c0ebf09fb62c503cc7a7aff985a0e32b3fc4ca34121",
+                    "mixHash" : "0xde30b19d53e761dcd4d87a928d4bb6f67a638d1ddd91e47fe65c6203f038f136",
+                    "nonce" : "0xae866594403aa4e1",
                     "number" : "0x01",
                     "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
                     "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a07316d2347ea807ee6caae26ee8d8da9c763351a2b6e58f51bdab9efc7b68d7bd88e952a997e2992d7cf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0de30b19d53e761dcd4d87a928d4bb6f67a638d1ddd91e47fe65c6203f038f13688ae866594403aa4e1f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x518b9d88be2226972f6fa485307b401b30f067152812a1ab25c92e308e95a0a0",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa503acab1c85b36e1f880c0ebf09fb62c503cc7a7aff985a0e32b3fc4ca34121",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x0ace74f5ca783845e7b87971bdc07f143bd65abba6a0a564105b30fe86fe5f31",
-                    "mixHash" : "0x2d8d67f162dc21a33e7996abc93f97ed477718c3c1e42de590521caf69f391ce",
-                    "nonce" : "0x79d1da7fd917ddd0",
+                    "hash" : "0x288b103651bf27e9e4e09f58eafc4b3408e75598ee80f754429b8ef5c5967dab",
+                    "mixHash" : "0xad63b95a9577e02c3271fedfcf8195a63244856f8bf271f2d9a85851b9939915",
+                    "nonce" : "0xecd8ab9ccd23f706",
                     "number" : "0x01",
                     "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x92d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53",
+                    "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
+                    "stateRoot" : "0x5a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092d9363e5c7787391f749bfd4ea55928f7d6d0f3d135ac5dd9e3e9df781f9b53a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a02d8d67f162dc21a33e7996abc93f97ed477718c3c1e42de590521caf69f391ce8879d1da7fd917ddd0f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0ad63b95a9577e02c3271fedfcf8195a63244856f8bf271f2d9a85851b993991588ecd8ab9ccd23f706f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ace74f5ca783845e7b87971bdc07f143bd65abba6a0a564105b30fe86fe5f31",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x288b103651bf27e9e4e09f58eafc4b3408e75598ee80f754429b8ef5c5967dab",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0xecac8ec28ac3c5192ef4a8eddb9f6ee74b77744e049cc5089a0579f23c1cc765",
+                    "mixHash" : "0x77bec7f6d563941d5a30774908e42064ceb859384aba66341333461a6463cc5a",
+                    "nonce" : "0x010a04b84c12d67f",
+                    "number" : "0x01",
+                    "parentHash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
+                    "receiptTrie" : "0xef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7",
+                    "stateRoot" : "0x5a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a5e23b1fefffde3998059b6a2f38f4bcb6bbd5f4ee049cb17987b8bc6d437d3a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0ef2a406a2c6b71a26126f4bcc35ba10ffb09ca41b82a241875b4c01d4f83b7e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a077bec7f6d563941d5a30774908e42064ceb859384aba66341333461a6463cc5a88010a04b84c12d67ff862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3de6ac2960fd2d0c107bd36195a03ddf016daa78cd2965a73c20a54797a77717",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a8a64f4b10e862190adc0f0fd186fc6395bb37563ffdff6dc22395316fbec3ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xecac8ec28ac3c5192ef4a8eddb9f6ee74b77744e049cc5089a0579f23c1cc765",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0.json
index 563af6186..0ce419c25 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x1eccd3e963b76c1edc5bd403e0b85566f09b1589c57498e2068ff02807cd84d3",
-                    "mixHash" : "0x48d8ba2c709a8eaeee0c38e3b79782b2e1f5bee00fbf79fd422bfea20f6266fe",
-                    "nonce" : "0xa39c73cff227e008",
+                    "hash" : "0xdb686248f56226a46e526183d9d2d251275e6b813692d03fde64881ddd94c595",
+                    "mixHash" : "0x21b93c216d4d3c92f7d2ce7093f43800a046d8bae7d5f209c1f52c933f896d7d",
+                    "nonce" : "0xa1e4ebb84206ca86",
                     "number" : "0x01",
                     "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
-                    "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
-                    "stateRoot" : "0x527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x56d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a048d8ba2c709a8eaeee0c38e3b79782b2e1f5bee00fbf79fd422bfea20f6266fe88a39c73cff227e008f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a021b93c216d4d3c92f7d2ce7093f43800a046d8bae7d5f209c1f52c933f896d7d88a1e4ebb84206ca86f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1eccd3e963b76c1edc5bd403e0b85566f09b1589c57498e2068ff02807cd84d3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdb686248f56226a46e526183d9d2d251275e6b813692d03fde64881ddd94c595",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0xeb27ed4413178639b873def300bce4f32623a88c524c6d072186a1c911a487f4",
-                    "mixHash" : "0x8d2b2c475a5afbaac2f07c37d634e178d8572f45d0e2bd6ac279beca97e0ea1e",
-                    "nonce" : "0xd7c4845421c0db24",
+                    "hash" : "0x6fba5444a2ef391397c86da2be55c58d461e1b2fbe500b7861354310bfdf761b",
+                    "mixHash" : "0xc131f350e77964ea364ffb831f525db8c2cae5a95e283a99931e8758a0e75b75",
+                    "nonce" : "0x585b3487c7cf3969",
                     "number" : "0x01",
                     "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
-                    "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
-                    "stateRoot" : "0x527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29",
+                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
+                    "stateRoot" : "0x56d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a08d2b2c475a5afbaac2f07c37d634e178d8572f45d0e2bd6ac279beca97e0ea1e88d7c4845421c0db24f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0c131f350e77964ea364ffb831f525db8c2cae5a95e283a99931e8758a0e75b7588585b3487c7cf3969f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb27ed4413178639b873def300bce4f32623a88c524c6d072186a1c911a487f4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6fba5444a2ef391397c86da2be55c58d461e1b2fbe500b7861354310bfdf761b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x034892376c7e7fd23838172cce1633a3b5f12d2528bffbe281246e64abc8f316",
-                    "mixHash" : "0x1066b3c5bccf54c3ffa43fed94b7ef53bd953cea44ba5fcfff4f236d31044886",
-                    "nonce" : "0x61286169ef920ff2",
+                    "hash" : "0xf0e9ff6511d173756bc39a28e27e6e3b84e99917ee0d5cd088c8c4439f72efe1",
+                    "mixHash" : "0xf270d441e54d49ad39ab3540bca53b95a4e11deaeae78dfaa332a081ccdd6fee",
+                    "nonce" : "0x268b0db8232ead39",
                     "number" : "0x01",
                     "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
                     "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a01066b3c5bccf54c3ffa43fed94b7ef53bd953cea44ba5fcfff4f236d310448868861286169ef920ff2f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0f270d441e54d49ad39ab3540bca53b95a4e11deaeae78dfaa332a081ccdd6fee88268b0db8232ead39f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x034892376c7e7fd23838172cce1633a3b5f12d2528bffbe281246e64abc8f316",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf0e9ff6511d173756bc39a28e27e6e3b84e99917ee0d5cd088c8c4439f72efe1",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +391,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x73c3f2019032406b2b9bfbbc55e0da97b12059841c2bb516dfe6b386d7db6228",
-                    "mixHash" : "0xe44597b3b408964ff5f8d3d21d19a6496914691cf1394abece9d1b02d1fcc816",
-                    "nonce" : "0x4396b53654be5d00",
+                    "hash" : "0x19863e21357ac65000e64e17f8bddc963119fb2cbb66f1ce535ae916ea240fac",
+                    "mixHash" : "0xa116cd9464feaf7b2799a1bf10de99f5108944f2135444bf2a7ede579d37d88a",
+                    "nonce" : "0xdbaa5d43ab8855bc",
                     "number" : "0x01",
                     "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
                     "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
@@ -388,7 +402,7 @@
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0e44597b3b408964ff5f8d3d21d19a6496914691cf1394abece9d1b02d1fcc816884396b53654be5d00f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0a116cd9464feaf7b2799a1bf10de99f5108944f2135444bf2a7ede579d37d88a88dbaa5d43ab8855bcf862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73c3f2019032406b2b9bfbbc55e0da97b12059841c2bb516dfe6b386d7db6228",
-        "network" : "Homestead",
+        "lastblockhash" : "0x19863e21357ac65000e64e17f8bddc963119fb2cbb66f1ce535ae916ea240fac",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
@@ -483,10 +497,10 @@
             }
         }
     },
-    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x020f58",
-                    "hash" : "0x2a29dc44118797f34cc7db032ff6157977b6b7d582e04ba054051c5c36d38349",
-                    "mixHash" : "0x96b77795d3dd3776272ef4b3fbad60afe9e3ea0396f9d0df8be32dfe0527f768",
-                    "nonce" : "0x6fd61df94f0301f3",
+                    "hash" : "0x276569a773d108987ba8422a0976ba5adc913c3ebffec3076f7bd0d821b6c27d",
+                    "mixHash" : "0x9689eac40717727f89afaac05811f75297e1c841f60cd2b6902dcf12be41afeb",
+                    "nonce" : "0xbb5e14800544eea5",
                     "number" : "0x01",
                     "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
-                    "receiptTrie" : "0x54eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9d",
-                    "stateRoot" : "0x56d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81d",
+                    "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
+                    "stateRoot" : "0x527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056d9eb4260a4f51b88f2b7c06e1c940073296c5c2762b31fdd9ac5eaa48cc81da0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a054eeafc8891222b787b9c9bfab7e0d99866447dad965b012fa2e09404455ec9db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a096b77795d3dd3776272ef4b3fbad60afe9e3ea0396f9d0df8be32dfe0527f768886fd61df94f0301f3f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a09689eac40717727f89afaac05811f75297e1c841f60cd2b6902dcf12be41afeb88bb5e14800544eea5f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a29dc44118797f34cc7db032ff6157977b6b7d582e04ba054051c5c36d38349",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x276569a773d108987ba8422a0976ba5adc913c3ebffec3076f7bd0d821b6c27d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60f58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a300a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x020f58",
+                    "hash" : "0x6454b778a826191bb01dda400707ed9dc87a0b58ca2d56bc3f83adef93e1179e",
+                    "mixHash" : "0xe76a06c91983a3ab6666efa566b6dab8d268cabbb7cacfdb435fa7b07bccdbd4",
+                    "nonce" : "0xb96d7af7901174b1",
+                    "number" : "0x01",
+                    "parentHash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
+                    "receiptTrie" : "0x252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683",
+                    "stateRoot" : "0x527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a01707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0527ce3956e9c9fadce22205b3db1fda347de608fdd33b1479da40ee4d0039d29a0aa88f8c92f1660ca93f6181e71ae0f3922f03c2634cf8c759793327a523efb40a0252c292076fb4666df0764a00c3dc5c9cce003d71ec2f6b53148f4caf2172683b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083020f588203e880a0e76a06c91983a3ab6666efa566b6dab8d268cabbb7cacfdb435fa7b07bccdbd488b96d7af7901174b1f862f860800183020f5894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0a379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242a016db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x020f58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa379f1c29785f2dbdf0e550632f4c8ec03817168d8be30fba39d51ddc5ede242",
+                        "s" : "0x16db8cae0757ac3707f3c6c3e04f7384d33208d7cc2ea7f571965fdc9de023e7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1707c80e0a152a45f8e7ec03feb731de017bdc509e3fbfd91ecd257fcc39990b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0372051c35efcf313ec1aca7416a6544d3b0adab38abfe45840481bf47eb07d55a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6454b778a826191bb01dda400707ed9dc87a0b58ca2d56bc3f83adef93e1179e",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60f58",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0.json
index 66b15eb1f..30ef4840d 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SUICIDE_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x952af87281394506c6032b780e316eb64b272f87b1d7d0e0357a12025058bbbc",
-                    "mixHash" : "0x4aa7c38c33192c1a0a4fcbaee22154e374a04e2ffedfdd6dedef4ebc9065110a",
-                    "nonce" : "0xf578e508c9352313",
+                    "hash" : "0x529bcb332c24dcccc880f68c23c391e1c468599a8935f69fce8c3c963ffa0301",
+                    "mixHash" : "0xc9a60c20cce2e9fce62449350f8c4922144b77bab19ee86cda99af6f8642f752",
+                    "nonce" : "0x7ddc517435f9ff5f",
                     "number" : "0x01",
                     "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
-                    "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
-                    "stateRoot" : "0x143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x0401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a04aa7c38c33192c1a0a4fcbaee22154e374a04e2ffedfdd6dedef4ebc9065110a88f578e508c9352313f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a0c9a60c20cce2e9fce62449350f8c4922144b77bab19ee86cda99af6f8642f752887ddc517435f9ff5ff862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x952af87281394506c6032b780e316eb64b272f87b1d7d0e0357a12025058bbbc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x529bcb332c24dcccc880f68c23c391e1c468599a8935f69fce8c3c963ffa0301",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f586a0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SUICIDE_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x840268bac24387f2d1f33d27d12631f08fcd4c25ddaaa21a7985080f1c1b46c4",
-                    "mixHash" : "0x0dba5c29447853772802432522bbb60a39655cfde44d21edd9cd9ce811cb030f",
-                    "nonce" : "0xd66e5d46faa4cdf4",
+                    "hash" : "0x565a307055cb380adb86ef7beabd95d7cebb92c75849da8eff9efea87f069e78",
+                    "mixHash" : "0x4da15241636f25ff910a9ec260bb714958400265225a0982e2bc71f16bf687c8",
+                    "nonce" : "0x575c79a5bee226b6",
                     "number" : "0x01",
                     "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
-                    "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
-                    "stateRoot" : "0x143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x0401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a00dba5c29447853772802432522bbb60a39655cfde44d21edd9cd9ce811cb030f88d66e5d46faa4cdf4f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a04da15241636f25ff910a9ec260bb714958400265225a0982e2bc71f16bf687c888575c79a5bee226b6f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x840268bac24387f2d1f33d27d12631f08fcd4c25ddaaa21a7985080f1c1b46c4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x565a307055cb380adb86ef7beabd95d7cebb92c75849da8eff9efea87f069e78",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f586a0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SUICIDE_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x91517ec4109d435d7d7ac09d797c1da524ec228f6ab6a533d379462060cf7273",
-                    "mixHash" : "0x1b64bb59bd03c168be04ff86e2dba9bf3a6bc9eb3867122abfd70cfd38b681eb",
-                    "nonce" : "0xf077151435277f33",
+                    "hash" : "0x315226de6aad656745ae652edb23142dd1a347aa23c954b1c7ca0bc5969c9edf",
+                    "mixHash" : "0x0801119177b158bcdff1875f28ea98d8955733ab2d3472d73716cf6ea2f3a4d4",
+                    "nonce" : "0x998af962eee52bef",
                     "number" : "0x01",
                     "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
                     "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a01b64bb59bd03c168be04ff86e2dba9bf3a6bc9eb3867122abfd70cfd38b681eb88f077151435277f33f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a00801119177b158bcdff1875f28ea98d8955733ab2d3472d73716cf6ea2f3a4d488998af962eee52beff862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91517ec4109d435d7d7ac09d797c1da524ec228f6ab6a533d379462060cf7273",
-        "network" : "Frontier",
+        "lastblockhash" : "0x315226de6aad656745ae652edb23142dd1a347aa23c954b1c7ca0bc5969c9edf",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f586a0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SUICIDE_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xefda73614dc90f993ea756b7fb379a9a81bf86968dab4bbf712bd76d9b140483",
-                    "mixHash" : "0x94734f78795d1dc95b3cd3e1c11dcbdbedacc7cb87125696eb3c8b22744741c0",
-                    "nonce" : "0x120385ac40eddbe2",
+                    "hash" : "0x18fb261ffa09e676424eb478b768caeed3ecbecfe4a8fdd212072ba45cf90c11",
+                    "mixHash" : "0x2600ddbe347d595982af521bceed8a63af99bc8e625e8df3952af84c0ff2c8c4",
+                    "nonce" : "0xe87c3f645eec57a4",
                     "number" : "0x01",
                     "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
                     "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a094734f78795d1dc95b3cd3e1c11dcbdbedacc7cb87125696eb3c8b22744741c088120385ac40eddbe2f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a02600ddbe347d595982af521bceed8a63af99bc8e625e8df3952af84c0ff2c8c488e87c3f645eec57a4f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefda73614dc90f993ea756b7fb379a9a81bf86968dab4bbf712bd76d9b140483",
-        "network" : "Homestead",
+        "lastblockhash" : "0x18fb261ffa09e676424eb478b768caeed3ecbecfe4a8fdd212072ba45cf90c11",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f586a0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_SUICIDE_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xb164d816eb286ad9ca5ecae0cb07bcdab8caa1d0f6574ffe98a4a2081828bab4",
-                    "mixHash" : "0xce770152c12aa43c6a0c8fc61a3c9692279833ff63d2b109c10f24a34f2a1f1a",
-                    "nonce" : "0xa3e0222bcd7b8136",
+                    "hash" : "0x37a06fafd67f94ddbb3e46256bd55dafceaa528acd6ea649e25a1e8c77742664",
+                    "mixHash" : "0x6a528343139eeb7e4a5cb3912b23648bdb569fb7caf865268569a6627b1444c3",
+                    "nonce" : "0xb7f22bafbfc3a766",
                     "number" : "0x01",
                     "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
-                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
-                    "stateRoot" : "0x0401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37",
+                    "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
+                    "stateRoot" : "0x143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00401b43d7bf340e52617de1577db098cea92d634dbdf62ea995df6d185ccdc37a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a0ce770152c12aa43c6a0c8fc61a3c9692279833ff63d2b109c10f24a34f2a1f1a88a3e0222bcd7b8136f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a06a528343139eeb7e4a5cb3912b23648bdb569fb7caf865268569a6627b1444c388b7f22bafbfc3a766f862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb164d816eb286ad9ca5ecae0cb07bcdab8caa1d0f6574ffe98a4a2081828bab4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x37a06fafd67f94ddbb3e46256bd55dafceaa528acd6ea649e25a1e8c77742664",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f586a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a38960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b619c40f150600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b619c40f150600c600255600c600355600c6004555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0xe5507defa439b82aec6f52a95125eba5625a34e5214301a12d85219ed9f24987",
+                    "mixHash" : "0x1390a8624b8a6b8f13d2d52199268c96ab1c32ddbf9f0e1061018744fb75f859",
+                    "nonce" : "0x3d2c26aa74d358ed",
+                    "number" : "0x01",
+                    "parentHash" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
+                    "receiptTrie" : "0xc4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3",
+                    "stateRoot" : "0x143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x35d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2fa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0be08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0143d54e20aa53e1852d50164bc6558e96a561afe662432d20967bb1ab35566a4a035d0179810f808ab57286e10ad2d3c6cec1bd53fd556e8c08e759cd2a022e2faa0c4a3481754fb81055b0b3bc87efd0f7711135d94cb1b500fa957261ba19467c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830186a08203e880a01390a8624b8a6b8f13d2d52199268c96ab1c32ddbf9f0e1061018744fb75f859883d2c26aa74d358edf862f8608001830186a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca083ab9a4b442353a1c16e436911c07e3727e3b8e22f682d6dc9fa2ed86bdb5317a04659371aed349c8145fc7dd61b924223d30b1c59a9994d8789495ca7ff1c4e15c0",
+                "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" : "0xbe08b4dd48caae4f151e3dc47f1d6e25353a978bc1b6075858912fa9a4b59868",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02975f7f03e90dff3c1d3ec48997c3b2d4be2e5bb61c4d1a951ca7d5015e32d3fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe5507defa439b82aec6f52a95125eba5625a34e5214301a12d85219ed9f24987",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f586a0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0.json
index 0454170c1..bb9d9e86e 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0xb25326ef7a723d8b39629fcda4900d8002a14984f7fd40821b725229c287d205",
-                    "mixHash" : "0x79c5dce4e2e8fab387ed246475203b8520f82bd71f57a2a02fb68d632207c2fc",
-                    "nonce" : "0xba5a2ab8e178be29",
+                    "hash" : "0x3ce394b9c2238b97ab73e74e51d0525073ff5dd0bc19c93232a532e5b537e742",
+                    "mixHash" : "0x3c869f13a464db7136273abd970521ef6c2a569a91cd539071668292a5f81af7",
+                    "nonce" : "0x13cfd4dddd13a378",
                     "number" : "0x01",
                     "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
-                    "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
-                    "stateRoot" : "0x6fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0x4aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a079c5dce4e2e8fab387ed246475203b8520f82bd71f57a2a02fb68d632207c2fc88ba5a2ab8e178be29f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a03c869f13a464db7136273abd970521ef6c2a569a91cd539071668292a5f81af78813cfd4dddd13a378f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb25326ef7a723d8b39629fcda4900d8002a14984f7fd40821b725229c287d205",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3ce394b9c2238b97ab73e74e51d0525073ff5dd0bc19c93232a532e5b537e742",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0xce64f93f40952cc47456d59a57c8757942a33c74edbfdc6e4a7ef8395d6ae936",
-                    "mixHash" : "0xbb58f27820ed8ee669c2ea8875fe48d2143fcd917ee1154d436babfbfbb84c7f",
-                    "nonce" : "0x35e89d674853b73d",
+                    "hash" : "0xf0c21f8b19d873224fe2117419f48580b0454b9265c3e75a3ecd67e950ce3dcb",
+                    "mixHash" : "0xed820edff3fd463da9b54c0d3abc7bfe471aed191b18fc6cc279138605f898dc",
+                    "nonce" : "0x0a468cafb9dbfd44",
                     "number" : "0x01",
                     "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
-                    "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
-                    "stateRoot" : "0x6fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0x4aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0bb58f27820ed8ee669c2ea8875fe48d2143fcd917ee1154d436babfbfbb84c7f8835e89d674853b73df862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0ed820edff3fd463da9b54c0d3abc7bfe471aed191b18fc6cc279138605f898dc880a468cafb9dbfd44f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce64f93f40952cc47456d59a57c8757942a33c74edbfdc6e4a7ef8395d6ae936",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf0c21f8b19d873224fe2117419f48580b0454b9265c3e75a3ecd67e950ce3dcb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x603f438f8ed2466d1cc5afa27d0e035a63d036fe61fe7eca5bfed5ba3394d9a0",
-                    "mixHash" : "0x8c3632129553a321c3f39f839f0e1a7b791d386c4adda731bccb775ba78b77ac",
-                    "nonce" : "0x7d601d205484c532",
+                    "hash" : "0x4147b05ebce873f52b94243ed4ab8b8bab5058a6cd3a175d404cb11cfe27cc4f",
+                    "mixHash" : "0xa7d34ceb791b21882a415e7dadd249dad5a6d9f6e267337dfd88373ebc8c0bb7",
+                    "nonce" : "0x96cb6b669cbe74ab",
                     "number" : "0x01",
                     "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
                     "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a08c3632129553a321c3f39f839f0e1a7b791d386c4adda731bccb775ba78b77ac887d601d205484c532f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0a7d34ceb791b21882a415e7dadd249dad5a6d9f6e267337dfd88373ebc8c0bb78896cb6b669cbe74abf862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x603f438f8ed2466d1cc5afa27d0e035a63d036fe61fe7eca5bfed5ba3394d9a0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4147b05ebce873f52b94243ed4ab8b8bab5058a6cd3a175d404cb11cfe27cc4f",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x4adbbf4533eb58e3bff318a2306079f55ddcfdef3419c46f18aa794125653d27",
-                    "mixHash" : "0x1ccbaefc4a47269c0aa67c614a05f726562d217f9c8f0b3818a847dd567186bf",
-                    "nonce" : "0x9e45319ad6849e9d",
+                    "hash" : "0xca4b50ecfecc8965d6fe6f243dc218fbf3877a28e8cf728552a96ffd246b49bb",
+                    "mixHash" : "0x99a927668feac88d1786d97b11487789c0d77ce1867b03d249e4abd63cb2cafd",
+                    "nonce" : "0xc4b63df2feebd728",
                     "number" : "0x01",
                     "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
                     "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a01ccbaefc4a47269c0aa67c614a05f726562d217f9c8f0b3818a847dd567186bf889e45319ad6849e9df862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a099a927668feac88d1786d97b11487789c0d77ce1867b03d249e4abd63cb2cafd88c4b63df2feebd728f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4adbbf4533eb58e3bff318a2306079f55ddcfdef3419c46f18aa794125653d27",
-        "network" : "Homestead",
+        "lastblockhash" : "0xca4b50ecfecc8965d6fe6f243dc218fbf3877a28e8cf728552a96ffd246b49bb",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x31c1d1b56bfdbcdd29b30871625c68c88c6bfe1c6bbf08a210502b1c7ab13d6e",
-                    "mixHash" : "0xf2287ee72eab29f342bdb3dc6a5737f02e681dc32758d94577493c556954b1e7",
-                    "nonce" : "0x143cdad71dc2a405",
+                    "hash" : "0xb17f4be6e2c85f0992966bc42f622a433f7214fe42fef8b7c0fdacc1cea1037b",
+                    "mixHash" : "0xb25500815fa66d458ade7546726340db26283c153a5364b4417b3b3a51d983b9",
+                    "nonce" : "0x35267662bf779f04",
                     "number" : "0x01",
                     "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
-                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
-                    "stateRoot" : "0x4aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78",
+                    "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
+                    "stateRoot" : "0x6fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aee2a5b2ef31bb0347a50294503223bcb8f360a179ecfaafaaa668e036f2f78a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0f2287ee72eab29f342bdb3dc6a5737f02e681dc32758d94577493c556954b1e788143cdad71dc2a405f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0b25500815fa66d458ade7546726340db26283c153a5364b4417b3b3a51d983b98835267662bf779f04f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31c1d1b56bfdbcdd29b30871625c68c88c6bfe1c6bbf08a210502b1c7ab13d6e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb17f4be6e2c85f0992966bc42f622a433f7214fe42fef8b7c0fdacc1cea1037b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f524f8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3eb08",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0124f8",
+                    "hash" : "0x3160cc4f355fb6a29977c68d5b616317436a133334191195d7405e922b5d016e",
+                    "mixHash" : "0xb53df36f7b41d2a5e278d1329ffeb268fb55154c499e51612393ef5d2ada1aa8",
+                    "nonce" : "0x13e5fb37a9b34e69",
+                    "number" : "0x01",
+                    "parentHash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
+                    "receiptTrie" : "0x2b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46c",
+                    "stateRoot" : "0x6fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a01ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fd049ff0f7aca62ae4a0e9c6748313fe73959dbb575b6db7c122b6de9050411a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a02b941922a587f0cf2e4bedf1a8fc6c32b7a772f560d733fa06363c251b72a46cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0b53df36f7b41d2a5e278d1329ffeb268fb55154c499e51612393ef5d2ada1aa88813e5fb37a9b34e69f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4faf",
+                        "s" : "0x7a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3d",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1ca981d89b88061cce8518f844a7bb26f16b3fc9de6bc36ea1ae6bb6c6f8463f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0397214c0d0290df0559c366ac003f1eaec56c27cfeb958a882de151b696db74ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3160cc4f355fb6a29977c68d5b616317436a133334191195d7405e922b5d016e",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0.json
index e7831c902..a4fff7048 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x0c366beb6dbb2cf59c7a6226642221d9d7e86449e3bc9e6c9304426b64d65456",
-                    "mixHash" : "0xdf082b773922ef736633f9712448f1fe4017920c726a048a299a5b4005dc8b9d",
-                    "nonce" : "0x716260e2c44b00ad",
+                    "hash" : "0x802f277bd467974bf56f12fec9e9a373dffccb1b8bb95f258b0bded463ae1dd7",
+                    "mixHash" : "0xa5eeb194a78f97c44d0588dc165a26b46112a85162d071101e0a5696de255e91",
+                    "nonce" : "0x4f03ba99927bdcf9",
                     "number" : "0x01",
                     "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
-                    "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
-                    "stateRoot" : "0xdaa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0x3eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0df082b773922ef736633f9712448f1fe4017920c726a048a299a5b4005dc8b9d88716260e2c44b00adf862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654ca09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0a5eeb194a78f97c44d0588dc165a26b46112a85162d071101e0a5696de255e91884f03ba99927bdcf9f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c366beb6dbb2cf59c7a6226642221d9d7e86449e3bc9e6c9304426b64d65456",
-        "network" : "EIP150",
+        "lastblockhash" : "0x802f277bd467974bf56f12fec9e9a373dffccb1b8bb95f258b0bded463ae1dd7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x962a43d1d3ebb470d5ba2f8fad155af48bcb6e5d4cf4026399108f7e6fde4ffc",
-                    "mixHash" : "0x601c4b978bb105c41017fb1dd05a84e61aaa97daf1ecb0c049d8de032d126cfa",
-                    "nonce" : "0xa1f188a169d3aa45",
+                    "hash" : "0x7d6da6e6f7261a7dc20318affc5d4623798d9b4760e13a460d6b8c4a8338466b",
+                    "mixHash" : "0x02a08af99d7a36f874655df258899b2b7b607059fbdf8af0b0aa6b6848daf1d4",
+                    "nonce" : "0x301b93fc0f76f6e4",
                     "number" : "0x01",
                     "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
-                    "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
-                    "stateRoot" : "0xdaa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0x3eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0601c4b978bb105c41017fb1dd05a84e61aaa97daf1ecb0c049d8de032d126cfa88a1f188a169d3aa45f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654ca09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a002a08af99d7a36f874655df258899b2b7b607059fbdf8af0b0aa6b6848daf1d488301b93fc0f76f6e4f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x962a43d1d3ebb470d5ba2f8fad155af48bcb6e5d4cf4026399108f7e6fde4ffc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7d6da6e6f7261a7dc20318affc5d4623798d9b4760e13a460d6b8c4a8338466b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x118e76ebb8dd4377c40535140e4407ae9eb12efe0e6badcfaf35b8ce123fb658",
-                    "mixHash" : "0x00dc13c71bdd249808bf7397b71333ef6a8a7165d1e7e50ba22f3db6b0db20df",
-                    "nonce" : "0xe99eb4d391ed6434",
+                    "hash" : "0xe47f58757959081918752ecc10e6ecd93ef1195c26bcb641d88d5ce96d943ce8",
+                    "mixHash" : "0x3f7cb57f12a633ff1c39ef4f4805182c4b7606a175e8a3641220c0f0fb194a7a",
+                    "nonce" : "0x2e4b2e21397480e1",
                     "number" : "0x01",
                     "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
                     "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a000dc13c71bdd249808bf7397b71333ef6a8a7165d1e7e50ba22f3db6b0db20df88e99eb4d391ed6434f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a03f7cb57f12a633ff1c39ef4f4805182c4b7606a175e8a3641220c0f0fb194a7a882e4b2e21397480e1f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x118e76ebb8dd4377c40535140e4407ae9eb12efe0e6badcfaf35b8ce123fb658",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe47f58757959081918752ecc10e6ecd93ef1195c26bcb641d88d5ce96d943ce8",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x1df29bd17c1f09a8075493a8c18558371ab6a66f32b459ce12ed16e5f982bd7f",
-                    "mixHash" : "0xccba827e4bb9bf53c5c542bd7866b4745a97707802e1ecea82576a5b72e84db8",
-                    "nonce" : "0xbf33c04370d992dc",
+                    "hash" : "0xd2eca6fd4049189edeee7f28011f57faf24695de86a263268dfe5f09be2e5670",
+                    "mixHash" : "0xd1054d7ae24b95ca0c4f171f83849a4d127278e4cf3629f75fcde7c5e88ffa49",
+                    "nonce" : "0xf5db4e8dd56c1fdf",
                     "number" : "0x01",
                     "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
                     "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0ccba827e4bb9bf53c5c542bd7866b4745a97707802e1ecea82576a5b72e84db888bf33c04370d992dcf862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0d1054d7ae24b95ca0c4f171f83849a4d127278e4cf3629f75fcde7c5e88ffa4988f5db4e8dd56c1fdff862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1df29bd17c1f09a8075493a8c18558371ab6a66f32b459ce12ed16e5f982bd7f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd2eca6fd4049189edeee7f28011f57faf24695de86a263268dfe5f09be2e5670",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x459a754bf2bc235eaa77f3b3f2f9a8b768bab1fae16454f7d0282c65ce94fdbe",
-                    "mixHash" : "0xe7492470e9ef5419a95a424d7e55b1ad1abc3fdd1663b904c55c42716f1fd4cc",
-                    "nonce" : "0x596059b4914542bf",
+                    "hash" : "0x19e1145b6dc0300d47020a1fbca2ab66a56d910aa5f6265264098c71b8ea4eab",
+                    "mixHash" : "0x56628edcf6285e51780684dcf9e14efa5a54befbe6dbe07d9aa8dd9408ecb61b",
+                    "nonce" : "0xf0c1b62960654c44",
                     "number" : "0x01",
                     "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
-                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
-                    "stateRoot" : "0x3eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654c",
+                    "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
+                    "stateRoot" : "0xdaa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03eadafb4bc52adf74b53dc9de15bbffd4b7a0503cdf32c0cd551db25e73e654ca09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0e7492470e9ef5419a95a424d7e55b1ad1abc3fdd1663b904c55c42716f1fd4cc88596059b4914542bff862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a056628edcf6285e51780684dcf9e14efa5a54befbe6dbe07d9aa8dd9408ecb61b88f0c1b62960654c44f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x459a754bf2bc235eaa77f3b3f2f9a8b768bab1fae16454f7d0282c65ce94fdbe",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x19e1145b6dc0300d47020a1fbca2ab66a56d910aa5f6265264098c71b8ea4eab",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f524f8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3eb08",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0124f8",
+                    "hash" : "0xe9c1a462c62c2740424229dd16e8a78adf4feaba813e6471a4a96d557280e8b3",
+                    "mixHash" : "0x0da49921875b2062799cc5122cc0aeecaa301a9cd5ba8497e3469ba362a7e74b",
+                    "nonce" : "0xd052a88a6263e305",
+                    "number" : "0x01",
+                    "parentHash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
+                    "receiptTrie" : "0xdc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688",
+                    "stateRoot" : "0xdaa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daa45707008cda99ea36a83fb4e452bbffce2827852a8b66beac5867a96f7d96a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0dc4b08a2dae4d1e4d6091fbb6f35911a52428c4e2fe62291b00590388a816688b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a00da49921875b2062799cc5122cc0aeecaa301a9cd5ba8497e3469ba362a7e74b88d052a88a6263e305f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4faf",
+                        "s" : "0x7a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3d",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x809b7dd06a16c669b7b3b44299519aeaf42422185f67220c861a4225e9ee81df",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aef940fcf588f1f1c405e29355197f561da262099af9888512ad71ee98357654a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe9c1a462c62c2740424229dd16e8a78adf4feaba813e6471a4a96d557280e8b3",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0.json
index f2aa29812..0ab48ceb3 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x1fbf809339769172b4a4d298d144decd60296384f1ea764dae1a94bc58ab3438",
-                    "mixHash" : "0xe46036c4661b0c11571c3e50dad43b26ccbf24bba58ea9486908fde38317702c",
-                    "nonce" : "0x766843b33cf64da9",
+                    "hash" : "0x08e20c50fa916bbb8609ef35ac154e863c49fbf60c7c2d81e673e9a541b22fc8",
+                    "mixHash" : "0x79a805ed7e817627a1099108daef33c9678285b06df324c7611d34180338e923",
+                    "nonce" : "0x7bd51afc24eb4ac5",
                     "number" : "0x01",
                     "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
-                    "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
-                    "stateRoot" : "0x1f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0xa485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0e46036c4661b0c11571c3e50dad43b26ccbf24bba58ea9486908fde38317702c88766843b33cf64da9f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a079a805ed7e817627a1099108daef33c9678285b06df324c7611d34180338e923887bd51afc24eb4ac5f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fbf809339769172b4a4d298d144decd60296384f1ea764dae1a94bc58ab3438",
-        "network" : "EIP150",
+        "lastblockhash" : "0x08e20c50fa916bbb8609ef35ac154e863c49fbf60c7c2d81e673e9a541b22fc8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -138,10 +145,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -153,18 +160,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x73762eda3148cec151e62d21c23f30e652c2f656eb25641fcfb2baad9d6b3a9f",
-                    "mixHash" : "0x7194a4a9df430fb7fe3d198f5fa5d79c7946bb9a9629a1505d9cf92e6b7dac31",
-                    "nonce" : "0x7454347f2a8fb5bf",
+                    "hash" : "0xf41753862349dcb00dd537d777e10d5a85a230356258cadd8071b3736fbcf951",
+                    "mixHash" : "0x18f46d6519a96c144398840c3cd045a51a1ccac2dbb70012011f8d782fa5ba7f",
+                    "nonce" : "0x03ee68dc44ad20e6",
                     "number" : "0x01",
                     "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
-                    "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
-                    "stateRoot" : "0x1f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39",
+                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
+                    "stateRoot" : "0xa485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a07194a4a9df430fb7fe3d198f5fa5d79c7946bb9a9629a1505d9cf92e6b7dac31887454347f2a8fb5bff862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a018f46d6519a96c144398840c3cd045a51a1ccac2dbb70012011f8d782fa5ba7f8803ee68dc44ad20e6f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -201,9 +208,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73762eda3148cec151e62d21c23f30e652c2f656eb25641fcfb2baad9d6b3a9f",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf41753862349dcb00dd537d777e10d5a85a230356258cadd8071b3736fbcf951",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
@@ -277,10 +291,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -292,9 +306,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x962f96d968013900297cfaf012cf5c0f5706c26e817fc65176f9cb3e4165724a",
-                    "mixHash" : "0x9953ff9d928aa462e471d37db0ba7f2c5a44c0588f1496e9b432bbea77f31d85",
-                    "nonce" : "0x33c220a629f32207",
+                    "hash" : "0x4bf3569500b6470c37bbbf67a58e20f7aa7c7ef12af918bf799d351b3dbb9360",
+                    "mixHash" : "0xa8337b5d26d4ecfaeb2ca8a4632aa23105333eb61b5e3bdee000cd7b1475106b",
+                    "nonce" : "0x3aded2a7cb64313e",
                     "number" : "0x01",
                     "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
                     "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
@@ -303,7 +317,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a09953ff9d928aa462e471d37db0ba7f2c5a44c0588f1496e9b432bbea77f31d858833c220a629f32207f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0a8337b5d26d4ecfaeb2ca8a4632aa23105333eb61b5e3bdee000cd7b1475106b883aded2a7cb64313ef862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -340,8 +354,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x962f96d968013900297cfaf012cf5c0f5706c26e817fc65176f9cb3e4165724a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4bf3569500b6470c37bbbf67a58e20f7aa7c7ef12af918bf799d351b3dbb9360",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -416,10 +430,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -431,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x8a19182165b155ef8cb8f45e73877f06641cd513bb43db003f5bb34e06c51248",
-                    "mixHash" : "0x574cca15ec6bcf3421da6b4190ce0adcac5f004ee281e1be2f0cdd1276cc5089",
-                    "nonce" : "0xd87c6c15aae29930",
+                    "hash" : "0x1d3fc1452cd12e248d94f02daf0d556f47ee9969b63efa520a201246e645f7fe",
+                    "mixHash" : "0xd67c75e2084078c33e272e59722814abae52de921456b8e50d28457bda7f6371",
+                    "nonce" : "0xb0c1310fc9a312be",
                     "number" : "0x01",
                     "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
                     "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
@@ -442,7 +456,7 @@
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0574cca15ec6bcf3421da6b4190ce0adcac5f004ee281e1be2f0cdd1276cc508988d87c6c15aae29930f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0d67c75e2084078c33e272e59722814abae52de921456b8e50d28457bda7f637188b0c1310fc9a312bef862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -479,8 +493,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a19182165b155ef8cb8f45e73877f06641cd513bb43db003f5bb34e06c51248",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1d3fc1452cd12e248d94f02daf0d556f47ee9969b63efa520a201246e645f7fe",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
@@ -555,10 +569,10 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -570,18 +584,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0124f8",
-                    "hash" : "0x43425dc42edf84bfa8e2487260919b666c4128defe43fb31a3e2ab14c5021d6e",
-                    "mixHash" : "0xee5233a09030582c2cc75ef7f3cf4038ccc1e6db53b1819c7f74da910fb73391",
-                    "nonce" : "0xd272463f85fda906",
+                    "hash" : "0x94e9cda5de2cd1ade5c1bc08849748f07d67441f209f2e1611a17417731c20ee",
+                    "mixHash" : "0xde6f430dca6d7a578b290d3988da233602e8f2819991af4329c78946532c4ee0",
+                    "nonce" : "0xe57c22e99b7a30bf",
                     "number" : "0x01",
                     "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
-                    "receiptTrie" : "0x125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3",
-                    "stateRoot" : "0xa485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190",
+                    "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
+                    "stateRoot" : "0x1f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a485166a4e62452c092e7e3c8cf0356a42a5f6034d456a5859875372f629b190a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0125ad3ea753d690f62898c2cc4ebd0b0beb8cd0940db90c6af7ca8c082829ae3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0ee5233a09030582c2cc75ef7f3cf4038ccc1e6db53b1819c7f74da910fb7339188d272463f85fda906f862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0de6f430dca6d7a578b290d3988da233602e8f2819991af4329c78946532c4ee088e57c22e99b7a30bff862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -618,16 +632,148 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43425dc42edf84bfa8e2487260919b666c4128defe43fb31a3e2ab14c5021d6e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x94e9cda5de2cd1ade5c1bc08849748f07d67441f209f2e1611a17417731c20ee",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f524f8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3eb08",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0124f8",
+                    "hash" : "0x06be97cf11bf6232c8d6e3dc62f6943e1edaa17b17d322ae3a24fb0240b403c0",
+                    "mixHash" : "0xb1ac49a373b0c75f1290ae2ac4ac30f8246e70dd229e07ed58ebead39f4074e7",
+                    "nonce" : "0x5977122f6afa22cb",
+                    "number" : "0x01",
+                    "parentHash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
+                    "receiptTrie" : "0xfe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69",
+                    "stateRoot" : "0x1f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0dc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f0fb75fa6c26e54fada2b1663ceb0c97287fc93515a37485caf81c85a0f0f39a09a511166bed6422fb0dac78f4dfe3b6826fdd0e55485b9bf0e1f6893dfa94da3a0fe50760046d5aa36a6589af109751c873777c3f41650b7c7d0c9d4e766194d69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124f88203e880a0b1ac49a373b0c75f1290ae2ac4ac30f8246e70dd229e07ed58ebead39f4074e7885977122f6afa22cbf862f8608001830124f894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba06fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4fafa07a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fab621529b9a7d4acafc1ae9708a15b9a5b19abe1d8fc79a31320725f9a4faf",
+                        "s" : "0x7a1e4cc8b6cb36926e8d9cdb1245cd8eb77813e1fc63983cd3abd899f88b9f3d",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xdc3f64c048a7012b0b62a6a60c4a26d9aa37ac15733fa233d6012e7d1aaa0139",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c7b6312f76093842dc86182264f34c4ad6d3615d535fa4bd79a9b2a48272011a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06be97cf11bf6232c8d6e3dc62f6943e1edaa17b17d322ae3a24fb0240b403c0",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f524f8",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0.json
index 85b3ee836..3f7e3e8b0 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x89f6ab2d9b45e7204d37d050503cbbe3827876af748de9a39d7d27ff5e4bf411",
-                    "mixHash" : "0xe7fb1a90fe2a182fccfce93b2866ba0896e400c849cb8c490e01ba4a07930fd6",
-                    "nonce" : "0x772f420236badf57",
+                    "hash" : "0x98f9bf6471a9c80717f67bf5b0f82d61e70600d30383508907d1bbb190b9001c",
+                    "mixHash" : "0x2739b8315ab5a779fa7e16883228e7d3d6fe4228ea3ac2b9ba7062e25a7901db",
+                    "nonce" : "0x44851262586895f1",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e7fb1a90fe2a182fccfce93b2866ba0896e400c849cb8c490e01ba4a07930fd688772f420236badf57c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a02739b8315ab5a779fa7e16883228e7d3d6fe4228ea3ac2b9ba7062e25a7901db8844851262586895f1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89f6ab2d9b45e7204d37d050503cbbe3827876af748de9a39d7d27ff5e4bf411",
-        "network" : "EIP150",
+        "lastblockhash" : "0x98f9bf6471a9c80717f67bf5b0f82d61e70600d30383508907d1bbb190b9001c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf6d10681444094d9e723421276c6999e3fbcb38207e1db92c90d590a61c036ba",
-                    "mixHash" : "0x7ac01d29d2ab7cbeb9ef79f1e62b058f85b489998f6652a45b23161294b19759",
-                    "nonce" : "0xf09e20373ef4820b",
+                    "hash" : "0xfd549e71fb7f96d785da86eecafcbd1931b656650eedd411fe538f2950f63c40",
+                    "mixHash" : "0xa50f5650de69b6ecdf0cbd67d4c56cd068d3e5d2904b367d24ba1d6e355b3328",
+                    "nonce" : "0xbf89d4f4e192303b",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a07ac01d29d2ab7cbeb9ef79f1e62b058f85b489998f6652a45b23161294b1975988f09e20373ef4820bc0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0a50f5650de69b6ecdf0cbd67d4c56cd068d3e5d2904b367d24ba1d6e355b332888bf89d4f4e192303bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6d10681444094d9e723421276c6999e3fbcb38207e1db92c90d590a61c036ba",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfd549e71fb7f96d785da86eecafcbd1931b656650eedd411fe538f2950f63c40",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -174,9 +188,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x57f1257863b20cdb8252bd04f0a96552c2d1ff620b08a56bff56c0f113f0bc3c",
-                    "mixHash" : "0xdeb7fd2294cd0f9501efb56ee82de37785c75647b0542b153e13a4c910234ce6",
-                    "nonce" : "0x3807d161fd601f30",
+                    "hash" : "0x267696fafa505783315a558f4d1ca3b909e701b52e93628a801b7fac07e62c6d",
+                    "mixHash" : "0x9d5d60c8e84683792370ae51532eb099859d709eedd07a70b4d5898d76ee8ed9",
+                    "nonce" : "0x83d387128353f36f",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -185,7 +199,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0deb7fd2294cd0f9501efb56ee82de37785c75647b0542b153e13a4c910234ce6883807d161fd601f30c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09d5d60c8e84683792370ae51532eb099859d709eedd07a70b4d5898d76ee8ed98883d387128353f36fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -211,8 +225,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57f1257863b20cdb8252bd04f0a96552c2d1ff620b08a56bff56c0f113f0bc3c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x267696fafa505783315a558f4d1ca3b909e701b52e93628a801b7fac07e62c6d",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -254,9 +268,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6f9e13e4bde658c2d61375d57f59699abaca98493fc9c110747921c6c10fa9d9",
-                    "mixHash" : "0xe20f59044bbc71372e4125febf8f9484633cd067a5aac8551bc4c6723aa5ae2c",
-                    "nonce" : "0x6cad1b13b79050bb",
+                    "hash" : "0x8bcc4a2b8c92ca078197a8d087dc1c601e0a29fe0bee5e2794b7f2e7b4cbe0aa",
+                    "mixHash" : "0x1a85080151e07c8454c7e844f7509dcef16f381d3884586b15d2ecf86511d8b3",
+                    "nonce" : "0x8ea3ef479f6fdbea",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -265,7 +279,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e20f59044bbc71372e4125febf8f9484633cd067a5aac8551bc4c6723aa5ae2c886cad1b13b79050bbc0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a01a85080151e07c8454c7e844f7509dcef16f381d3884586b15d2ecf86511d8b3888ea3ef479f6fdbeac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -291,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f9e13e4bde658c2d61375d57f59699abaca98493fc9c110747921c6c10fa9d9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8bcc4a2b8c92ca078197a8d087dc1c601e0a29fe0bee5e2794b7f2e7b4cbe0aa",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -319,10 +333,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALL_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,18 +348,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x795fa06c46eeecf6b1ff0ae01d3ef807fef10fae4f23576e5e593e82f19e23e1",
-                    "mixHash" : "0x1237d67453b2cb97e9a95abf99743a72272825fcb2ef9d0cb8617a28c380e8b4",
-                    "nonce" : "0xdf4edfd1c46026af",
+                    "hash" : "0xba5cd20b3e4a29dec1f2ef779b3623abe079bc34dbddcff5282489f550cd0885",
+                    "mixHash" : "0xe6b44312117e75d74987c28248b70d40f06ee139ef81d03b0d31669960f02a0e",
+                    "nonce" : "0xb2047e569a107b3d",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a01237d67453b2cb97e9a95abf99743a72272825fcb2ef9d0cb8617a28c380e8b488df4edfd1c46026afc0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e6b44312117e75d74987c28248b70d40f06ee139ef81d03b0d31669960f02a0e88b2047e569a107b3dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -371,16 +385,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x795fa06c46eeecf6b1ff0ae01d3ef807fef10fae4f23576e5e593e82f19e23e1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xba5cd20b3e4a29dec1f2ef779b3623abe079bc34dbddcff5282489f550cd0885",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALL_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x367bcbdadaf947075ddd63bb2409ed2bd084023e32e8949ba0af57f6ce630326",
+                    "mixHash" : "0x68e1974cb1c223fe19d394a483ad7eaa8f66fb636c36444f406d9c95e03ed1f9",
+                    "nonce" : "0x5ca2d2b7e24a1fbd",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a068e1974cb1c223fe19d394a483ad7eaa8f66fb636c36444f406d9c95e03ed1f9885ca2d2b7e24a1fbdc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x367bcbdadaf947075ddd63bb2409ed2bd084023e32e8949ba0af57f6ce630326",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0.json
index 019661281..cacad9acd 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xff7c6fac2259da7113ac8d9b516710400f3ff90715313e0b462d23dafe154654",
-                    "mixHash" : "0x68c33fecc5eea16d80924909131f2e4e6ce41a6fd250b568d8845cc43c0c54bd",
-                    "nonce" : "0xe79aa0fc737f7b67",
+                    "hash" : "0x761e606a6f0e753862d69fea8b00b0630e1a1693f8c9ebd731553d0980481e93",
+                    "mixHash" : "0x57e6a8d9de1d47fc87c27338f5ac0f67bdb519a1c50213fd9d2a5c2f19aae0a8",
+                    "nonce" : "0x69d56415b244155b",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a068c33fecc5eea16d80924909131f2e4e6ce41a6fd250b568d8845cc43c0c54bd88e79aa0fc737f7b67c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a057e6a8d9de1d47fc87c27338f5ac0f67bdb519a1c50213fd9d2a5c2f19aae0a88869d56415b244155bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff7c6fac2259da7113ac8d9b516710400f3ff90715313e0b462d23dafe154654",
-        "network" : "EIP150",
+        "lastblockhash" : "0x761e606a6f0e753862d69fea8b00b0630e1a1693f8c9ebd731553d0980481e93",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -93,10 +100,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -108,18 +115,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x82dac2105e94a5f9778d95ff40231c641fd583ee29543905f964b91e01735109",
-                    "mixHash" : "0x63e1d4d24729b297e4d722065e6edd43f8c17616d2d81417a4667bcbe364cbee",
-                    "nonce" : "0x8c53386a430519ee",
+                    "hash" : "0x6193c2cae7cd0be736a82ff9bc505161ccc51e05cd72ed66d207101ec8fb75f0",
+                    "mixHash" : "0x54eda01d2f9cb96c18d438b72cc42347302d8f69d1bb1537f3485528684cffef",
+                    "nonce" : "0xaddb676fce1015d1",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a063e1d4d24729b297e4d722065e6edd43f8c17616d2d81417a4667bcbe364cbee888c53386a430519eec0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a054eda01d2f9cb96c18d438b72cc42347302d8f69d1bb1537f3485528684cffef88addb676fce1015d1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -145,9 +152,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82dac2105e94a5f9778d95ff40231c641fd583ee29543905f964b91e01735109",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6193c2cae7cd0be736a82ff9bc505161ccc51e05cd72ed66d207101ec8fb75f0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -187,10 +201,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -202,9 +216,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbb3968827cabbfffcf5060a943720e650147b26df4c95a3b669993356181f21c",
-                    "mixHash" : "0x2b037f29f7fe5f01bd9d6a21f25e62917f250b110bd0039df09cfccd672246af",
-                    "nonce" : "0x4f37edeb5e86c542",
+                    "hash" : "0xaa0dd372323e04908b80d74359018a692e2fec3f85cedfa339de07de9edbe511",
+                    "mixHash" : "0x4cb37bf9d1566198a5bfcfc1c0479fa3f267398ed7e75d9ccc03562a4dac339b",
+                    "nonce" : "0x14b43bacbd849276",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -213,7 +227,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a02b037f29f7fe5f01bd9d6a21f25e62917f250b110bd0039df09cfccd672246af884f37edeb5e86c542c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a04cb37bf9d1566198a5bfcfc1c0479fa3f267398ed7e75d9ccc03562a4dac339b8814b43bacbd849276c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -239,8 +253,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb3968827cabbfffcf5060a943720e650147b26df4c95a3b669993356181f21c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xaa0dd372323e04908b80d74359018a692e2fec3f85cedfa339de07de9edbe511",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -281,10 +295,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -296,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf640b751eaab5423f35bec4cdcf6e6abce103e3d729c85e4f79437176fb73ba8",
-                    "mixHash" : "0xdec07239c97c05932b5d13d71525abd8ea56ff259045875e092eec711f228e4c",
-                    "nonce" : "0xf4a76b8f6c0dbe1e",
+                    "hash" : "0x7daaef57ed62b2a313237c3f9aa0f8bb3564f6b84ab768fd2704dd118f74e7c5",
+                    "mixHash" : "0x3509393f4f8b7f20548071b7292bdee531e7f1bf26e6ed3d24cab27e427b6cf7",
+                    "nonce" : "0xf06e76a122e982f8",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -307,7 +321,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0dec07239c97c05932b5d13d71525abd8ea56ff259045875e092eec711f228e4c88f4a76b8f6c0dbe1ec0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a03509393f4f8b7f20548071b7292bdee531e7f1bf26e6ed3d24cab27e427b6cf788f06e76a122e982f8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -333,8 +347,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf640b751eaab5423f35bec4cdcf6e6abce103e3d729c85e4f79437176fb73ba8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7daaef57ed62b2a313237c3f9aa0f8bb3564f6b84ab768fd2704dd118f74e7c5",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -375,10 +389,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -390,18 +404,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3ce34bf09a313760f883d8f5ff616496bd08d247fba700047b3e1eb3a2227161",
-                    "mixHash" : "0x42cb0a7b74c342e952d947974e861e33e242ac19960ac2ea4f9a82735a672f1c",
-                    "nonce" : "0xd559451f19cfb8d0",
+                    "hash" : "0x1498ecae781801186923df9d82b49c4fe55c77489ad8f58e738d1d93246f13dc",
+                    "mixHash" : "0x5c5cf404f8104a93fe60fad87e5a1f0811f9dbf0a57edfc24bb393f8ae83d208",
+                    "nonce" : "0x16699965e40d77c7",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
+                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a042cb0a7b74c342e952d947974e861e33e242ac19960ac2ea4f9a82735a672f1c88d559451f19cfb8d0c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a05c5cf404f8104a93fe60fad87e5a1f0811f9dbf0a57edfc24bb393f8ae83d2088816699965e40d77c7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -427,16 +441,103 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ce34bf09a313760f883d8f5ff616496bd08d247fba700047b3e1eb3a2227161",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1498ecae781801186923df9d82b49c4fe55c77489ad8f58e738d1d93246f13dc",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x787dc73a1e53f70c1a77a217440e7ef3373bd213b19d426bd4534d8b6a954d48",
+                    "mixHash" : "0xf32c574074cafee4a9672354d689f0758fe716b32ea83145fbae12ad4e6335b5",
+                    "nonce" : "0x3a96afc6efd8e09b",
+                    "number" : "0x01",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f32c574074cafee4a9672354d689f0758fe716b32ea83145fbae12ad4e6335b5883a96afc6efd8e09bc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x787dc73a1e53f70c1a77a217440e7ef3373bd213b19d426bd4534d8b6a954d48",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
index b420ce963..6fe1c9ea5 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3c35e854ccc471f31f4ab0e5ff4f583a0df194fe15031443edf534d98bcc01a5",
-                    "mixHash" : "0x12e87d022e26e8a99b1cd94f51c596d49712ffd95ac3f5c2f797b91040d789ca",
-                    "nonce" : "0xc2ec11c759edd236",
+                    "hash" : "0x8cc81898493ec9bedbf2f6881380a715d349ccc45a0fd0cd771d86c241f6b547",
+                    "mixHash" : "0xc418638b814a3dbd7e34a69c3cf4297498f915c9c2b9b798e8fbf811b8b70489",
+                    "nonce" : "0x497b02b5e185fb5f",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a012e87d022e26e8a99b1cd94f51c596d49712ffd95ac3f5c2f797b91040d789ca88c2ec11c759edd236c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0c418638b814a3dbd7e34a69c3cf4297498f915c9c2b9b798e8fbf811b8b7048988497b02b5e185fb5fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c35e854ccc471f31f4ab0e5ff4f583a0df194fe15031443edf534d98bcc01a5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8cc81898493ec9bedbf2f6881380a715d349ccc45a0fd0cd771d86c241f6b547",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -93,10 +100,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -108,18 +115,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2bfee67d2e5a98b7b1504c69f23cf5572aa77412e5d20b666f58a6fb289d9ebf",
-                    "mixHash" : "0xf02185c515d8a37dc793508938e095c2267fda0cd9f0553e4f748baf6762ac2e",
-                    "nonce" : "0xc830120387a12008",
+                    "hash" : "0x66c2ae1277fb9cc58b3989f3e7e8d50a6f608afd6bffd790f255dfe520aa7d84",
+                    "mixHash" : "0x9de73eed7ca4f230ee1fc186a83e9775ee76a5113ad780308dc3d55c0b89acaf",
+                    "nonce" : "0x1baf10d8ea742311",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f02185c515d8a37dc793508938e095c2267fda0cd9f0553e4f748baf6762ac2e88c830120387a12008c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09de73eed7ca4f230ee1fc186a83e9775ee76a5113ad780308dc3d55c0b89acaf881baf10d8ea742311c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -145,9 +152,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bfee67d2e5a98b7b1504c69f23cf5572aa77412e5d20b666f58a6fb289d9ebf",
-        "network" : "EIP158",
+        "lastblockhash" : "0x66c2ae1277fb9cc58b3989f3e7e8d50a6f608afd6bffd790f255dfe520aa7d84",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -187,10 +201,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -202,9 +216,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x7577b3c2a9fda95f25723198de58096ac13babafbc12b3d07c19d385cde9f992",
-                    "mixHash" : "0x9c32a5068436851fb43645d3e7aa4f3318111de64bc64239d90f9aed02df704d",
-                    "nonce" : "0x4b926f4f1cdc98f5",
+                    "hash" : "0x53fbfa8b561079deacdb0106f3be3f967a3346f8d822f7bf16c3767b71cb439c",
+                    "mixHash" : "0x9862946f7a08465ae27b6d7e2e39681fb2249f1340adac1002410af39f10abc1",
+                    "nonce" : "0x85fafd3b41d5fd0b",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -213,7 +227,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09c32a5068436851fb43645d3e7aa4f3318111de64bc64239d90f9aed02df704d884b926f4f1cdc98f5c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09862946f7a08465ae27b6d7e2e39681fb2249f1340adac1002410af39f10abc18885fafd3b41d5fd0bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -239,8 +253,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7577b3c2a9fda95f25723198de58096ac13babafbc12b3d07c19d385cde9f992",
-        "network" : "Frontier",
+        "lastblockhash" : "0x53fbfa8b561079deacdb0106f3be3f967a3346f8d822f7bf16c3767b71cb439c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -281,10 +295,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -296,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x63246a38820831fc3495449eb2ff07739d499e302a45a92ac4fc96aaa59286f4",
-                    "mixHash" : "0xcdb17fb77a4c03359e8286e192b136b12f5b2391d7715bb8aef354a08a25a076",
-                    "nonce" : "0x9ec88bf82b9e35e4",
+                    "hash" : "0x1243f4ea39dec95021e5d6aec343123047d4035c9b8f9317515fc093883ea643",
+                    "mixHash" : "0xcbdce6844afb19b45bd90dabc6c1b39ef778b456f84b73f8eae0e8e7da63ff39",
+                    "nonce" : "0x4f5fcf0f60550a3d",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -307,7 +321,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0cdb17fb77a4c03359e8286e192b136b12f5b2391d7715bb8aef354a08a25a076889ec88bf82b9e35e4c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0cbdce6844afb19b45bd90dabc6c1b39ef778b456f84b73f8eae0e8e7da63ff39884f5fcf0f60550a3dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -333,8 +347,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63246a38820831fc3495449eb2ff07739d499e302a45a92ac4fc96aaa59286f4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1243f4ea39dec95021e5d6aec343123047d4035c9b8f9317515fc093883ea643",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -375,10 +389,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -390,18 +404,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x65a0cd22822455ea6caa00b24c914789aff82ca88faaeff4313e89d98a444238",
-                    "mixHash" : "0xa46f92ae67a17a35018759ac024574a41742a09a0d08fb786d99917617251b84",
-                    "nonce" : "0xce0aeba5dfe4a286",
+                    "hash" : "0x6fc9a883d43c8df915dc51758bfb3858b77158f4dfc86b9a429c3ada439f31b9",
+                    "mixHash" : "0x7a39c9b36de2fcf5fd4b4a101d6367db5a7db43bb4ba18749a25545c0c313306",
+                    "nonce" : "0xd9f8c84670bc0bc6",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
+                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0a46f92ae67a17a35018759ac024574a41742a09a0d08fb786d99917617251b8488ce0aeba5dfe4a286c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a07a39c9b36de2fcf5fd4b4a101d6367db5a7db43bb4ba18749a25545c0c31330688d9f8c84670bc0bc6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -427,16 +441,103 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65a0cd22822455ea6caa00b24c914789aff82ca88faaeff4313e89d98a444238",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6fc9a883d43c8df915dc51758bfb3858b77158f4dfc86b9a429c3ada439f31b9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x8aa7b0dc2cf66ee7450e3c89e6ce42ccc7e4a6cddca6a502cb00595908d82319",
+                    "mixHash" : "0xf9349601411350e726cc78016e57f408e610ef8dabbeba7ecddfda548101e9fd",
+                    "nonce" : "0xbf065e2fd86219e1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f9349601411350e726cc78016e57f408e610ef8dabbeba7ecddfda548101e9fd88bf065e2fd86219e1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8aa7b0dc2cf66ee7450e3c89e6ce42ccc7e4a6cddca6a502cb00595908d82319",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0.json
index e71499a59..98f76e69e 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x224e6b2fdd0e7548e641b1f511deb28757e8efa33069d3a0e2cb030d6007cb95",
-                    "mixHash" : "0x4f10bd07f23c3879abb2bc254f87e691dbbe3d4f33dcd01efdd0f3e8d6afe629",
-                    "nonce" : "0x1bfddba767a96e6a",
+                    "hash" : "0x142eebf031926903dc87d85321f0c1c33a5ea8fc8c10d5fb2a6e26690de63068",
+                    "mixHash" : "0xdb5617aab90896517b0a8a9fc915d3b8175cddcfd42afa832c269e9859f08110",
+                    "nonce" : "0x2be86fbcef56ec8e",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a04f10bd07f23c3879abb2bc254f87e691dbbe3d4f33dcd01efdd0f3e8d6afe629881bfddba767a96e6ac0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0db5617aab90896517b0a8a9fc915d3b8175cddcfd42afa832c269e9859f08110882be86fbcef56ec8ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x224e6b2fdd0e7548e641b1f511deb28757e8efa33069d3a0e2cb030d6007cb95",
-        "network" : "EIP150",
+        "lastblockhash" : "0x142eebf031926903dc87d85321f0c1c33a5ea8fc8c10d5fb2a6e26690de63068",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -95,10 +102,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -110,18 +117,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf6438bdc3033b62d5cff14ac9938048b156f00dd1b3abbf0b2a747d683ce5543",
-                    "mixHash" : "0xacdd7c39a64b154ed8ff24058257d1572463f10cdb50b703379a22e6c5bff968",
-                    "nonce" : "0x32219169319eda93",
+                    "hash" : "0xe167c4b439e1058ca2e9d1e4f5744ccc0bc0f1bfa1356c99d3771906cdee233f",
+                    "mixHash" : "0xe884cc6bac76b7a8a53dbb3c895b7ad4edb53dec2049e13ff4c774e5f6a49fe5",
+                    "nonce" : "0x2e42669e95b31028",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0acdd7c39a64b154ed8ff24058257d1572463f10cdb50b703379a22e6c5bff9688832219169319eda93c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e884cc6bac76b7a8a53dbb3c895b7ad4edb53dec2049e13ff4c774e5f6a49fe5882e42669e95b31028c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -147,9 +154,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6438bdc3033b62d5cff14ac9938048b156f00dd1b3abbf0b2a747d683ce5543",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe167c4b439e1058ca2e9d1e4f5744ccc0bc0f1bfa1356c99d3771906cdee233f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -191,10 +205,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -206,9 +220,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc2ae10552903d519da961cd7ab4b076a4a51c9ead90d81cca4f00089bbcedc71",
-                    "mixHash" : "0x8d1221c0b715050bf239c74431813e3662bd32f56dc12c246b672e708bc77755",
-                    "nonce" : "0x63f4c72374c40f82",
+                    "hash" : "0x5f1b4c54b0132b17fd40e5813f0bedb1d66696b0545d79e7d24994c320c4dba7",
+                    "mixHash" : "0xf1ce52d3d8caed44e3d700e7309a60779b9166cf3c99ead1f4f9d1ab7185206f",
+                    "nonce" : "0xc67859f3a13a020b",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -217,7 +231,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a08d1221c0b715050bf239c74431813e3662bd32f56dc12c246b672e708bc777558863f4c72374c40f82c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f1ce52d3d8caed44e3d700e7309a60779b9166cf3c99ead1f4f9d1ab7185206f88c67859f3a13a020bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -243,8 +257,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2ae10552903d519da961cd7ab4b076a4a51c9ead90d81cca4f00089bbcedc71",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5f1b4c54b0132b17fd40e5813f0bedb1d66696b0545d79e7d24994c320c4dba7",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -287,10 +301,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -302,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd6f0392dc15ed62a00a887f67490ef641c1cfbb288247326d828f2630cadf8e8",
-                    "mixHash" : "0x0819300c7a00dcc612a71994c7bcca52f5bf18fd579b714695119786e0df18d8",
-                    "nonce" : "0x7ca891ef2431e1f1",
+                    "hash" : "0x6f41443512b2f36fcee455b2b150c4efd09521985ea416dc08b02f25efab286d",
+                    "mixHash" : "0xa0d303ce1c094e12ded87f91a89b18502d777e8fed436e8b776222e0f3f6322a",
+                    "nonce" : "0x408edbc279082c54",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -313,7 +327,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00819300c7a00dcc612a71994c7bcca52f5bf18fd579b714695119786e0df18d8887ca891ef2431e1f1c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0a0d303ce1c094e12ded87f91a89b18502d777e8fed436e8b776222e0f3f6322a88408edbc279082c54c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -339,8 +353,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6f0392dc15ed62a00a887f67490ef641c1cfbb288247326d828f2630cadf8e8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6f41443512b2f36fcee455b2b150c4efd09521985ea416dc08b02f25efab286d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -383,10 +397,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -398,18 +412,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x345c833bb651fb7492377d00e2cb732d82ce4ec959c7dbf37f9f22769b0cce34",
-                    "mixHash" : "0xc4ca79282d18332cab800e29eceef4611383729d2ec8cbb479987989490a1719",
-                    "nonce" : "0xa935ccf213db1423",
+                    "hash" : "0x4c897543cd40dd272d257aa6e9922079ffdcfb2b679941d03d32205f3e0af37b",
+                    "mixHash" : "0xd53dd89d27d475f943ab5c3d8a405d1694d01c93704b124d5843f2f1bf024e5b",
+                    "nonce" : "0xb193a328468bdcb8",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
+                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0c4ca79282d18332cab800e29eceef4611383729d2ec8cbb479987989490a171988a935ccf213db1423c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0d53dd89d27d475f943ab5c3d8a405d1694d01c93704b124d5843f2f1bf024e5b88b193a328468bdcb8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -435,16 +449,105 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x345c833bb651fb7492377d00e2cb732d82ce4ec959c7dbf37f9f22769b0cce34",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4c897543cd40dd272d257aa6e9922079ffdcfb2b679941d03d32205f3e0af37b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x376598fa8b3c97ff191f74ded24ea60566b3ab607be826b296075804af9659e9",
+                    "mixHash" : "0x2998234a497bbbde9cebc44b9ecdf3ab2bd84153673194cf13bc034944a1967c",
+                    "nonce" : "0x85396373c132556d",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a02998234a497bbbde9cebc44b9ecdf3ab2bd84153673194cf13bc034944a1967c8885396373c132556dc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x376598fa8b3c97ff191f74ded24ea60566b3ab607be826b296075804af9659e9",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0.json
index 6b1bbdd87..13b9415e1 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALLwithData_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2706d7ae5c2f223d4441813c1bc83b1fa2b9500ecf7f30a00fe7e7ce7be59ba4",
-                    "mixHash" : "0xfb19187f48bfa32b7996152f1941524d705c953d37cdc7d12bcd31164f03c9f5",
-                    "nonce" : "0x07370c9be218bf6e",
+                    "hash" : "0xd0551e8d8a6f6bf5f7869dbafc54efec4ab13034d39d7dfada8bfdec71af44e4",
+                    "mixHash" : "0x60ca16068d52c30c233e3d7c0e3195a176d9f1224bf49ed501ecd5b34fda46d5",
+                    "nonce" : "0x5015e2b8848678e2",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0fb19187f48bfa32b7996152f1941524d705c953d37cdc7d12bcd31164f03c9f58807370c9be218bf6ec0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a060ca16068d52c30c233e3d7c0e3195a176d9f1224bf49ed501ecd5b34fda46d5885015e2b8848678e2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2706d7ae5c2f223d4441813c1bc83b1fa2b9500ecf7f30a00fe7e7ce7be59ba4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd0551e8d8a6f6bf5f7869dbafc54efec4ab13034d39d7dfada8bfdec71af44e4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALLwithData_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa8bb66213b2273a80ec24bc41425e0fcb18508becab58c73a0ae28417bff54b7",
-                    "mixHash" : "0x9c6ca5d45abc8578c378a5767a8d4750e42aabda8613a407b09beb6e5ba4a35f",
-                    "nonce" : "0x583c2836844919ca",
+                    "hash" : "0x457c3b35b868ef88facc2ba577978f426cbae1ccf04342ab00d4b7e303456fe3",
+                    "mixHash" : "0x18fc9070be0beab4b8fc6f52abcdd6e9ed326065dd4c52db6aaddc685edb6327",
+                    "nonce" : "0xed0f8fcf07ff5834",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09c6ca5d45abc8578c378a5767a8d4750e42aabda8613a407b09beb6e5ba4a35f88583c2836844919cac0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a018fc9070be0beab4b8fc6f52abcdd6e9ed326065dd4c52db6aaddc685edb632788ed0f8fcf07ff5834c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8bb66213b2273a80ec24bc41425e0fcb18508becab58c73a0ae28417bff54b7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x457c3b35b868ef88facc2ba577978f426cbae1ccf04342ab00d4b7e303456fe3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALLwithData_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -174,9 +188,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4691aaf88900297f35d83165343ba0537addc879db43921b557b27342341fb18",
-                    "mixHash" : "0x15085b2d0ca0fbc2bea06d41111b077bd6780123735f375f83f4ffd1717248b6",
-                    "nonce" : "0x2969dbf52e6e3de4",
+                    "hash" : "0xbf9ca796c2f9a1bcbadd21b3e1ee4a9ee3ca243c4ebe375daf68d2d32b73fced",
+                    "mixHash" : "0x09a07f268b312fc0d003d567cffed544f78c78de60f03edf23ed6d44e04effb1",
+                    "nonce" : "0xcf4cdbacff43bd4a",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -185,7 +199,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a015085b2d0ca0fbc2bea06d41111b077bd6780123735f375f83f4ffd1717248b6882969dbf52e6e3de4c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a009a07f268b312fc0d003d567cffed544f78c78de60f03edf23ed6d44e04effb188cf4cdbacff43bd4ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -211,8 +225,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4691aaf88900297f35d83165343ba0537addc879db43921b557b27342341fb18",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbf9ca796c2f9a1bcbadd21b3e1ee4a9ee3ca243c4ebe375daf68d2d32b73fced",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALLwithData_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -254,9 +268,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xba6d7f1cc54eb89284174c047f9c874296e7b448d70ea1001d98ca43173c63c6",
-                    "mixHash" : "0x83e684ac9e3f796b7a713a8ec786c0f37ec091fc12034109880efbef402e78de",
-                    "nonce" : "0x7a91a5b6a1b7f52e",
+                    "hash" : "0x2d415618202db11720303e3ad041cfbffe6571d57ed6b3498e79d44d25c4bc14",
+                    "mixHash" : "0x49a680141b5dc474ef48fcdcb6db5003bdcca61cd26bb9ed94b1ebd1a81e48e6",
+                    "nonce" : "0xcb26803eb5a9660a",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -265,7 +279,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a083e684ac9e3f796b7a713a8ec786c0f37ec091fc12034109880efbef402e78de887a91a5b6a1b7f52ec0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a049a680141b5dc474ef48fcdcb6db5003bdcca61cd26bb9ed94b1ebd1a81e48e688cb26803eb5a9660ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -291,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba6d7f1cc54eb89284174c047f9c874296e7b448d70ea1001d98ca43173c63c6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2d415618202db11720303e3ad041cfbffe6571d57ed6b3498e79d44d25c4bc14",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -319,10 +333,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALLwithData_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,18 +348,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0bfba8d7b4d62b4f2feca92d119f4cf8caaf8a5f792646d4f7a9041682506af7",
-                    "mixHash" : "0xdecace7d12c52289c467c7dcddaf5be09965094e03f517a6f5de2d9c0b9579d7",
-                    "nonce" : "0xf8f32f1c2086eeee",
+                    "hash" : "0x03b15be44f369123ad4280ec2c29198818f204a9224a32c9aceae9dd058b1182",
+                    "mixHash" : "0xf69eab3fe36e16554f47cb4674b59c7f26b6997baac4141a53e58f123ad1fe63",
+                    "nonce" : "0xa9c5506a6ffd05f6",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0decace7d12c52289c467c7dcddaf5be09965094e03f517a6f5de2d9c0b9579d788f8f32f1c2086eeeec0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f69eab3fe36e16554f47cb4674b59c7f26b6997baac4141a53e58f123ad1fe6388a9c5506a6ffd05f6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -371,16 +385,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0bfba8d7b4d62b4f2feca92d119f4cf8caaf8a5f792646d4f7a9041682506af7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x03b15be44f369123ad4280ec2c29198818f204a9224a32c9aceae9dd058b1182",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xcb8d3b74a876bfba3e8e9cde9a05b1c26fb6bd29b8ef2150c07aaa35be24759e",
+                    "mixHash" : "0xe312e3af819c6773caf3c0dc0664da20df2add9fc0763edae545f0d18bf93ee4",
+                    "nonce" : "0x521436367176ce49",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e312e3af819c6773caf3c0dc0664da20df2add9fc0763edae545f0d18bf93ee488521436367176ce49c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb8d3b74a876bfba3e8e9cde9a05b1c26fb6bd29b8ef2150c07aaa35be24759e",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0.json
index 68dd8da7c..1ac15738e 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4dc94850774575618cdd717acd7eb895b8a71ce7883d8f34400116296c3a8b1d",
-                    "mixHash" : "0x0595decc32a351bb0469e6512d8618d205ff45bb55bd97519870651f503762b0",
-                    "nonce" : "0x0daceec026048fc0",
+                    "hash" : "0x98680a8bebb50e0ca0c696f56f1c8ab44800937266730e698c4d5688497d8e14",
+                    "mixHash" : "0x52c5c94829084851974d604e52628ce596488e101d7a271b3bf2d2a7762ab436",
+                    "nonce" : "0x044c63616f074025",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00595decc32a351bb0469e6512d8618d205ff45bb55bd97519870651f503762b0880daceec026048fc0c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a052c5c94829084851974d604e52628ce596488e101d7a271b3bf2d2a7762ab43688044c63616f074025c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dc94850774575618cdd717acd7eb895b8a71ce7883d8f34400116296c3a8b1d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x98680a8bebb50e0ca0c696f56f1c8ab44800937266730e698c4d5688497d8e14",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -93,10 +100,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -108,18 +115,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcabd7a704d807efc40465abb9dee88eab770641950996247c5e67e63eff0f3bc",
-                    "mixHash" : "0xaa43421ce705bf1c8d647aa4ce0fcc8a4e9957298403ca990daf195bfd7dea51",
-                    "nonce" : "0x9296d8945b7dce77",
+                    "hash" : "0x0ae544feaf97b8b82976702ee03bf24b3f83a6a3cfdab60aaeac8d5689057713",
+                    "mixHash" : "0xb229fc52fa6b61bc9cf841953f3654e10cf4b71cb8005a5db6a1c6709a1107a1",
+                    "nonce" : "0x0ea38ad7ba0911ba",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0aa43421ce705bf1c8d647aa4ce0fcc8a4e9957298403ca990daf195bfd7dea51889296d8945b7dce77c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0b229fc52fa6b61bc9cf841953f3654e10cf4b71cb8005a5db6a1c6709a1107a1880ea38ad7ba0911bac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -145,9 +152,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcabd7a704d807efc40465abb9dee88eab770641950996247c5e67e63eff0f3bc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0ae544feaf97b8b82976702ee03bf24b3f83a6a3cfdab60aaeac8d5689057713",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -187,10 +201,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -202,9 +216,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x865ba78cb9251508ac459c0e8521b3bb9f06d3d4c9adcb4ed6909afba891694c",
-                    "mixHash" : "0x1fa9595e085bc1cb952584bdf3a064c339c1afb44fb9e789ef7ea8b340173b54",
-                    "nonce" : "0x386f730e1f26e29f",
+                    "hash" : "0x84eaf917e7a6ff99a74fe2d9d142fa797b4b82aa62fdebeb3ab4f61345cb0107",
+                    "mixHash" : "0xb5bd09085ccf17a742ce5096e4cd59b7c3d2ee5ad40959468ca47f71821d6f25",
+                    "nonce" : "0x177e0ae71e560216",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -213,7 +227,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a01fa9595e085bc1cb952584bdf3a064c339c1afb44fb9e789ef7ea8b340173b5488386f730e1f26e29fc0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0b5bd09085ccf17a742ce5096e4cd59b7c3d2ee5ad40959468ca47f71821d6f2588177e0ae71e560216c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -239,8 +253,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x865ba78cb9251508ac459c0e8521b3bb9f06d3d4c9adcb4ed6909afba891694c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x84eaf917e7a6ff99a74fe2d9d142fa797b4b82aa62fdebeb3ab4f61345cb0107",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -281,10 +295,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -296,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb1f9a970b57ac738151162751e5dba045ce0706f7e1a0de4d264cd70a5bde24d",
-                    "mixHash" : "0x025cc1347fa18632aaa5a4ebaa04105ec19911de2815b9b22384df0e0bd07bf5",
-                    "nonce" : "0x212e282d3778b2b5",
+                    "hash" : "0x3c88428d5728af485c6a02edae4f736aebda5e0c5e1628fccf92322b02b70982",
+                    "mixHash" : "0x192629763ab6b2a25c8ccee4d97550e8199998c99bc6cb5292692163ce2af250",
+                    "nonce" : "0xf94568c0477abccb",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -307,7 +321,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0025cc1347fa18632aaa5a4ebaa04105ec19911de2815b9b22384df0e0bd07bf588212e282d3778b2b5c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0192629763ab6b2a25c8ccee4d97550e8199998c99bc6cb5292692163ce2af25088f94568c0477abccbc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -333,8 +347,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1f9a970b57ac738151162751e5dba045ce0706f7e1a0de4d264cd70a5bde24d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3c88428d5728af485c6a02edae4f736aebda5e0c5e1628fccf92322b02b70982",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -375,10 +389,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -390,18 +404,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4256d7737cc2a0d7a1b604cec85d753be3747a69e8ec121988ed23e469a30624",
-                    "mixHash" : "0xecfac4362e714edba3cc028ed85704801a874b60b812e457efac9fc92c74c450",
-                    "nonce" : "0x3b73a94771e96bf6",
+                    "hash" : "0xad279abff49bf3adf195d26fdf281383470d3ac0b1cab3e03bb82d3500e29b00",
+                    "mixHash" : "0x52cc6528449c03800128786c862bea281b0101be39151f66fbaac8f640a4a5d1",
+                    "nonce" : "0x96f107d7a0cf365e",
                     "number" : "0x01",
                     "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120",
+                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd2e30d2ecf9a69ff9ca01d3239b874857a3ce9daba8fddf76082d601c3a120a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0ecfac4362e714edba3cc028ed85704801a874b60b812e457efac9fc92c74c450883b73a94771e96bf6c0c0",
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a052cc6528449c03800128786c862bea281b0101be39151f66fbaac8f640a4a5d18896f107d7a0cf365ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -427,16 +441,103 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4256d7737cc2a0d7a1b604cec85d753be3747a69e8ec121988ed23e469a30624",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xad279abff49bf3adf195d26fdf281383470d3ac0b1cab3e03bb82d3500e29b00",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x801842b9f3d95b3e6390cacbd1c8793927dc59e5c3e60c53c1fc653ec8f3d5d7",
+                    "mixHash" : "0xf14ae88aed6742fbf9d37deeb7a71a96196e46f3be81a29ee34c1c506497e6ed",
+                    "nonce" : "0xa8858dff2a0d636b",
+                    "number" : "0x01",
+                    "parentHash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x62d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062d041954d0e5e9f7dd1d9c6d680ed4ef8241e0fa88ebdf2102d7d40d819aa13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f14ae88aed6742fbf9d37deeb7a71a96196e46f3be81a29ee34c1c506497e6ed88a8858dff2a0d636bc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb5023889cf4ec44e4331349eabf2d63171827cc2803351abd1f465cac3d1443e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x801842b9f3d95b3e6390cacbd1c8793927dc59e5c3e60c53c1fc653ec8f3d5d7",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0.json
index 2feb88196..fd6526c81 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2eb60365134bd66ecfd3a0197fedf0eb23a25132aa83d59d0d14c15e273b9704",
-                    "mixHash" : "0xeb27190a3b32f94fef7c794a03ff8d78b7a3f93287c050a5fe1ca6e16c92e08d",
-                    "nonce" : "0x10e36b07b6f10706",
+                    "hash" : "0x3c24fd719bd6814be7f86588db2fa8da08bc069e026404b38edcb82f26cd4e55",
+                    "mixHash" : "0x12bfb1c5fb544ea20f8d93bd067f94be1868cf4ba805a0fd451f2ed45f9ca5d0",
+                    "nonce" : "0x1de1362ac53c7ea8",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0eb27190a3b32f94fef7c794a03ff8d78b7a3f93287c050a5fe1ca6e16c92e08d8810e36b07b6f10706c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a012bfb1c5fb544ea20f8d93bd067f94be1868cf4ba805a0fd451f2ed45f9ca5d0881de1362ac53c7ea8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2eb60365134bd66ecfd3a0197fedf0eb23a25132aa83d59d0d14c15e273b9704",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3c24fd719bd6814be7f86588db2fa8da08bc069e026404b38edcb82f26cd4e55",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -93,10 +100,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -108,18 +115,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9b3b898a88c43f2936c3f37aaec68e184b064f8869bb68363677a015b2572d37",
-                    "mixHash" : "0xd5dac33e5639b5640b8aa303e208f3880b53934c00f90750813be3a9030225df",
-                    "nonce" : "0xf64374026c344ec6",
+                    "hash" : "0x1345af3ab0e8283996bb7b0413dee4356ce2d34405cc8f8ffd40f472a41f3c1d",
+                    "mixHash" : "0x6da2857f12ccace4b00e8e025e30f0154897bac07b6f322c21ea05a065c50a6a",
+                    "nonce" : "0x5004cbf8692cbe8e",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0d5dac33e5639b5640b8aa303e208f3880b53934c00f90750813be3a9030225df88f64374026c344ec6c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a06da2857f12ccace4b00e8e025e30f0154897bac07b6f322c21ea05a065c50a6a885004cbf8692cbe8ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -145,9 +152,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b3b898a88c43f2936c3f37aaec68e184b064f8869bb68363677a015b2572d37",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1345af3ab0e8283996bb7b0413dee4356ce2d34405cc8f8ffd40f472a41f3c1d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -187,10 +201,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -202,9 +216,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x73a3764a8a9084ee32ea175286bf7ea68de535ad6d569bc309c17b0ffc0edad9",
-                    "mixHash" : "0x1c304ddcb85f39a6363346c972dcec3df023c61d07df6ae9a525935b27338ce2",
-                    "nonce" : "0x99362c1b327e81dc",
+                    "hash" : "0x0a96b2cf9f0927675ef98a1a74c4e23d456e4b54540f4824e37cb0cc666c5cbb",
+                    "mixHash" : "0xb6fe8c648956ed9d9a7960901aea0fbd56cd529899f1143e9234df9fabff146b",
+                    "nonce" : "0x496b34773f5df0a9",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -213,7 +227,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a01c304ddcb85f39a6363346c972dcec3df023c61d07df6ae9a525935b27338ce28899362c1b327e81dcc0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0b6fe8c648956ed9d9a7960901aea0fbd56cd529899f1143e9234df9fabff146b88496b34773f5df0a9c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -239,8 +253,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73a3764a8a9084ee32ea175286bf7ea68de535ad6d569bc309c17b0ffc0edad9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0a96b2cf9f0927675ef98a1a74c4e23d456e4b54540f4824e37cb0cc666c5cbb",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -281,10 +295,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -296,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb233c6d5105c918d55d620635da78090c9fb9e3ee5b00736b8c5c300d5b39510",
-                    "mixHash" : "0x9b9231a2515606e3d2ea5e2d3e4f08f2c6aa06fb766dded86bc85bcd82dfe993",
-                    "nonce" : "0x628c6ff653b8b8cc",
+                    "hash" : "0x16b63a83d675999d985f46d49134074682c987fb2752b8ca65f141341a90a914",
+                    "mixHash" : "0x9d9e59c2f4d1ab06f4b709867c1c044c3e3abaa38842279ac8b9bc09cc7ef0ac",
+                    "nonce" : "0x7b6f7860d80b69a4",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -307,7 +321,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09b9231a2515606e3d2ea5e2d3e4f08f2c6aa06fb766dded86bc85bcd82dfe99388628c6ff653b8b8ccc0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09d9e59c2f4d1ab06f4b709867c1c044c3e3abaa38842279ac8b9bc09cc7ef0ac887b6f7860d80b69a4c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -333,8 +347,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb233c6d5105c918d55d620635da78090c9fb9e3ee5b00736b8c5c300d5b39510",
-        "network" : "Homestead",
+        "lastblockhash" : "0x16b63a83d675999d985f46d49134074682c987fb2752b8ca65f141341a90a914",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -375,10 +389,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -390,18 +404,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd21c8e233db9d6286680857a43a18ed60ab04f1eb2f287c2ee78edf725999618",
-                    "mixHash" : "0x5635a5799a3be3d90a26238496b418e843fb8c603f8bb5d881ebf93411895e6f",
-                    "nonce" : "0x6220bee4a7019873",
+                    "hash" : "0x2c23af1f302946f5d012d6bfe6095a2605c7fe161f8e7c6af9f3cd47c729270a",
+                    "mixHash" : "0xecff3b1a9af054e4a3f35a1fd628b5958c59a3f69781c44e85d2332fad104f72",
+                    "nonce" : "0x6cac9a41ae2427f2",
                     "number" : "0x01",
                     "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5",
+                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c8240ec635ee29f996657da5439e8c46bee05506efb087399a60d014594ded5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a05635a5799a3be3d90a26238496b418e843fb8c603f8bb5d881ebf93411895e6f886220bee4a7019873c0c0",
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0ecff3b1a9af054e4a3f35a1fd628b5958c59a3f69781c44e85d2332fad104f72886cac9a41ae2427f2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -427,16 +441,103 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd21c8e233db9d6286680857a43a18ed60ab04f1eb2f287c2ee78edf725999618",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2c23af1f302946f5d012d6bfe6095a2605c7fe161f8e7c6af9f3cd47c729270a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa9f368ca8f578d6a9ef6617d2b8b8bb42f8922be2e73b75cb017997e0bd1ae0a",
+                    "mixHash" : "0xd7b47096f9bb21e0931a7cd2964f3c84a8dec2770b78fb7da2d4c1c20c26de10",
+                    "nonce" : "0xef2da9bb0bf1d2d7",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x96746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0e41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096746dd28741f8765ca6ac0f87c3da349cb9083880fb35d97b1c6aa22b9d5183a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0d7b47096f9bb21e0931a7cd2964f3c84a8dec2770b78fb7da2d4c1c20c26de1088ef2da9bb0bf1d2d7c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41b9215d33e0e0bc97fc59cd46d07f66216ac26879d8fba3e4449d9f032ec76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa9f368ca8f578d6a9ef6617d2b8b8bb42f8922be2e73b75cb017997e0bd1ae0a",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0.json
index 2b53a968d..e9189be96 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x277304e10daded18af104269eb07c234c98d75502eb7e78f51976b6d1d061501",
-                    "mixHash" : "0x6551f06b7c6ae6154e2b6ce2077de799f109d6a84813a93c631b83e0fcd8b540",
-                    "nonce" : "0xd604c62c120d13ec",
+                    "hash" : "0x7d25914bc8383c60ce9ad1c162411a457bf82b92d71330daa47391bbe8acd757",
+                    "mixHash" : "0xf5157b1c7975c1ede5c96da936779702c8f4f383039e92c7ba4085af8643200b",
+                    "nonce" : "0x07f97989e17eb251",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a06551f06b7c6ae6154e2b6ce2077de799f109d6a84813a93c631b83e0fcd8b54088d604c62c120d13ecc0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0f5157b1c7975c1ede5c96da936779702c8f4f383039e92c7ba4085af8643200b8807f97989e17eb251c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x277304e10daded18af104269eb07c234c98d75502eb7e78f51976b6d1d061501",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7d25914bc8383c60ce9ad1c162411a457bf82b92d71330daa47391bbe8acd757",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -95,10 +102,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -110,18 +117,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x275b229dc8e5d7eb55df91a46ce7aea91eff6b2e22264d1825aad9d1be7566ee",
-                    "mixHash" : "0x9df0e19fa5bc9b8b55c693f20472fee115fe5659ac59a173635e193c401ae04e",
-                    "nonce" : "0x9be4658a012455f8",
+                    "hash" : "0x60c803f2b4b8195017cdcf0780232129f3246097ba3bd0ece1d58ac886aac394",
+                    "mixHash" : "0xfffcaf31df1bb7be84fbfb3276e44b44af7b7ae5d5db86a80c54059f507345f0",
+                    "nonce" : "0x75f1fb9841b08af7",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a09df0e19fa5bc9b8b55c693f20472fee115fe5659ac59a173635e193c401ae04e889be4658a012455f8c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0fffcaf31df1bb7be84fbfb3276e44b44af7b7ae5d5db86a80c54059f507345f08875f1fb9841b08af7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -147,9 +154,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x275b229dc8e5d7eb55df91a46ce7aea91eff6b2e22264d1825aad9d1be7566ee",
-        "network" : "EIP158",
+        "lastblockhash" : "0x60c803f2b4b8195017cdcf0780232129f3246097ba3bd0ece1d58ac886aac394",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -191,10 +205,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -206,9 +220,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x049da7182ee27d622d08f482dee68015e4b98482fe929fdfd09cd65ff80e0afc",
-                    "mixHash" : "0xe652ca77cc5c726f3fbd8577e13ce527c5b463a4ab34eb3a31cd150ca0085c59",
-                    "nonce" : "0x5df856651e364aab",
+                    "hash" : "0xc4b58a119a9759902c506edb54aa9f73999db4b8931ee500e5b55a4c97c31bb0",
+                    "mixHash" : "0x1bdcbf673bf32e60a978d12eab77ebea0504b536918434abc0864a4c292ce98a",
+                    "nonce" : "0x85bd221b2faf87fa",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -217,7 +231,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0e652ca77cc5c726f3fbd8577e13ce527c5b463a4ab34eb3a31cd150ca0085c59885df856651e364aabc0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a01bdcbf673bf32e60a978d12eab77ebea0504b536918434abc0864a4c292ce98a8885bd221b2faf87fac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -243,8 +257,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x049da7182ee27d622d08f482dee68015e4b98482fe929fdfd09cd65ff80e0afc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc4b58a119a9759902c506edb54aa9f73999db4b8931ee500e5b55a4c97c31bb0",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -287,10 +301,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -302,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcd00e29000b3a70bf96138f7a82ef0de18bd32918739202d1c68fa178fea98e4",
-                    "mixHash" : "0x52bb48f820b6987c97c64e10fff824afbf246d75caa75947e06cdc974ded32d4",
-                    "nonce" : "0x5168bcab5313a98e",
+                    "hash" : "0x384c60ba532c6632e7282f5980d00be3f30dd0f93c0a566c0a23368941957f61",
+                    "mixHash" : "0x09e520f531e4546cb80830789dfa6d499b1605be2c8e697e382c43031696f435",
+                    "nonce" : "0x2d48c1a777f99d9b",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -313,7 +327,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a052bb48f820b6987c97c64e10fff824afbf246d75caa75947e06cdc974ded32d4885168bcab5313a98ec0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a009e520f531e4546cb80830789dfa6d499b1605be2c8e697e382c43031696f435882d48c1a777f99d9bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -339,8 +353,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd00e29000b3a70bf96138f7a82ef0de18bd32918739202d1c68fa178fea98e4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x384c60ba532c6632e7282f5980d00be3f30dd0f93c0a566c0a23368941957f61",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -383,10 +397,10 @@
             }
         }
     },
-    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_Metropolis" : {
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_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/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -398,18 +412,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2c6c51436a4c205dd5ef1484c6ad20749c267a53ad5339dc65fb8c8246abf544",
-                    "mixHash" : "0x62ccfaf94f55c97317e5135c45159120cf5d776a6b22bbdbddc9fa3d15a897b5",
-                    "nonce" : "0xf4d8755d11acb837",
+                    "hash" : "0xc60aafb88c58d17fe1c22b89ba6b5fdcd54800384466c08d2a2454dbb490f320",
+                    "mixHash" : "0x2fdacea91376f8517ac9888f887a9eca21d86d66f070af6de13b41cfde0d6118",
+                    "nonce" : "0xd0b5d6e537060b1e",
                     "number" : "0x01",
                     "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ad",
+                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0e65642924d8890c28e950b327dd64fa681ff035b0a8ff3b1fa688fb4d6a2ada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a062ccfaf94f55c97317e5135c45159120cf5d776a6b22bbdbddc9fa3d15a897b588f4d8755d11acb837c0c0",
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a02fdacea91376f8517ac9888f887a9eca21d86d66f070af6de13b41cfde0d611888d0b5d6e537060b1ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -435,16 +449,105 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c6c51436a4c205dd5ef1484c6ad20749c267a53ad5339dc65fb8c8246abf544",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc60aafb88c58d17fe1c22b89ba6b5fdcd54800384466c08d2a2454dbb490f320",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        }
+    },
+    "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xdc59a6f94d75cd22332aa353de6b3a2137f657d8decbe4a375c0f1860e11f6de",
+                    "mixHash" : "0xdb9637b5d72b66270ea04d407eba66f7e139aa91488ec03a9cca036df2e3a365",
+                    "nonce" : "0x4c0c8edcda79b24f",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xd52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a01b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d52600583b780555cab0451d5a0a323e1a15f353f92e79a402a579eb947b62dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0db9637b5d72b66270ea04d407eba66f7e139aa91488ec03a9cca036df2e3a365884c0c8edcda79b24fc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b714b558fa4b8c8beec054d1bfa6a1b3781ec6e8077cf631eb3c73e6ca9cb80",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc59a6f94d75cd22332aa353de6b3a2137f657d8decbe4a375c0f1860e11f6de",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",