Hive tests with Byzantine

30 files changed, 5550 insertions, 1760 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0.json
index 09acbc2b7..18e1ad845 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawBalanceGas_d0g0v0_EIP150" : {
+    "RawBalanceGas_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/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x4d6bb39c36945aba6c0ed3462e80513f255d18efd827e80c99f0ec801a113a4b",
-                    "mixHash" : "0x9a65a38e17ca6a271a2a37a6621233176e5759fd877b17756d44b560f0572d09",
-                    "nonce" : "0x3d1b50402efb07f0",
+                    "hash" : "0xffe659bba13ca33b2ea95bc328efa2105f3a4bd1b514b4e4b86ebbdce62f41d7",
+                    "mixHash" : "0x42d8f8a2c947a7dcc11285dfb461abba8210a4ccd2e0488cf245e48630a63c77",
+                    "nonce" : "0x2670ba5c8ad24496",
                     "number" : "0x01",
                     "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
-                    "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
-                    "stateRoot" : "0x6b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baee",
+                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
+                    "stateRoot" : "0x5e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a09a65a38e17ca6a271a2a37a6621233176e5759fd877b17756d44b560f0572d09883d1b50402efb07f0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a042d8f8a2c947a7dcc11285dfb461abba8210a4ccd2e0488cf245e48630a63c77882670ba5c8ad24496f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d6bb39c36945aba6c0ed3462e80513f255d18efd827e80c99f0ec801a113a4b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xffe659bba13ca33b2ea95bc328efa2105f3a4bd1b514b4e4b86ebbdce62f41d7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee52",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "RawBalanceGas_d0g0v0_EIP158" : {
+    "RawBalanceGas_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/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x677556756257691ed15d3be1fc0146e642f56eac758de8a67402d5bf6cb3b862",
-                    "mixHash" : "0x8398cc52f3427e3e2e3e2f6a703ac40f62ecc008b1be63c0aabd96652993eda7",
-                    "nonce" : "0xdff5177114ecb630",
+                    "hash" : "0x42403f8514a913aedb2faac8fca1f90de5873aaa1c536c04c652fcaaebb64ecc",
+                    "mixHash" : "0xa894b6d5e0655f2485d9c015e996c3ce8b2ea265e04581df555c63b33f973232",
+                    "nonce" : "0x551222baab935af0",
                     "number" : "0x01",
                     "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
-                    "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
-                    "stateRoot" : "0x6b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baee",
+                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
+                    "stateRoot" : "0x5e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a08398cc52f3427e3e2e3e2f6a703ac40f62ecc008b1be63c0aabd96652993eda788dff5177114ecb630f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0a894b6d5e0655f2485d9c015e996c3ce8b2ea265e04581df555c63b33f97323288551222baab935af0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x677556756257691ed15d3be1fc0146e642f56eac758de8a67402d5bf6cb3b862",
-        "network" : "EIP158",
+        "lastblockhash" : "0x42403f8514a913aedb2faac8fca1f90de5873aaa1c536c04c652fcaaebb64ecc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee52",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "RawBalanceGas_d0g0v0_Frontier" : {
+    "RawBalanceGas_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/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x251dd1d5137b1aec78a2e9f693ad7cb73f3318eb63743501b849fd27b2bef21b",
-                    "mixHash" : "0x7e271a8356ffcdcd4eb3bf36e4e3ffe240d48e920a738f5432fb3d44b01f3d42",
-                    "nonce" : "0x8f7092db6e1ebb39",
+                    "hash" : "0x04e6530ce80e75cb1422be391e5f34ab511f9e31974859188153303c6d9224ff",
+                    "mixHash" : "0x71b685c825ba9c81a62419e1d8d314ebd05a20e73f9f9fe70a24e4e1864a3145",
+                    "nonce" : "0x33d73313b998e2c0",
                     "number" : "0x01",
                     "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
                     "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a07e271a8356ffcdcd4eb3bf36e4e3ffe240d48e920a738f5432fb3d44b01f3d42888f7092db6e1ebb39f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a071b685c825ba9c81a62419e1d8d314ebd05a20e73f9f9fe70a24e4e1864a31458833d73313b998e2c0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x251dd1d5137b1aec78a2e9f693ad7cb73f3318eb63743501b849fd27b2bef21b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x04e6530ce80e75cb1422be391e5f34ab511f9e31974859188153303c6d9224ff",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee52",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "RawBalanceGas_d0g0v0_Homestead" : {
+    "RawBalanceGas_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/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x7d5ad28bf4a205cb4387bee73d7a76a6319c327ed9670759f0db0dc8e8003a55",
-                    "mixHash" : "0xb2a116abc0278162a4a0a126fb5838fbe17eca23f76eae8f7c8dd3dbe88eeca3",
-                    "nonce" : "0x3d59a16243115a60",
+                    "hash" : "0x412d075a52dd2b8be5700ed3dfb17bfa30b23f0422366537fcd72f68a7d16b8f",
+                    "mixHash" : "0xe42f1442606ab18c6f1a8fea0e9b9641dfabe8c8141eac92e1053010badfb42c",
+                    "nonce" : "0x654832fcea88d993",
                     "number" : "0x01",
                     "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
                     "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0b2a116abc0278162a4a0a126fb5838fbe17eca23f76eae8f7c8dd3dbe88eeca3883d59a16243115a60f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0e42f1442606ab18c6f1a8fea0e9b9641dfabe8c8141eac92e1053010badfb42c88654832fcea88d993f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5ad28bf4a205cb4387bee73d7a76a6319c327ed9670759f0db0dc8e8003a55",
-        "network" : "Homestead",
+        "lastblockhash" : "0x412d075a52dd2b8be5700ed3dfb17bfa30b23f0422366537fcd72f68a7d16b8f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee52",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "RawBalanceGas_d0g0v0_Metropolis" : {
+    "RawBalanceGas_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/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0xdae8635a48ba5651cc287a64b0d6da312c0bbfd147d208c0ec5e609928f5820a",
-                    "mixHash" : "0xa0ac26f0187c05937bcae4ef06cd56d3b20a641d23e676716c13e4b535d89c6d",
-                    "nonce" : "0x3d9bc3fb03fd76c8",
+                    "hash" : "0x264bb4b2a0f128002f51a5c5616197ee3ef18bcb79fd9c8bd1cf1db5d17eed23",
+                    "mixHash" : "0xad069a4065de030f68087a45e3b0d8e0d0053d916ca6e768a3ba8c02b924fed4",
+                    "nonce" : "0x0336eb96bfd49faf",
                     "number" : "0x01",
                     "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
-                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
-                    "stateRoot" : "0x5e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301",
+                    "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
+                    "stateRoot" : "0x6b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e43937ce22bdf1089e376a7f3088abd3f1bdb29221b14d89eea841c50255301a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0a0ac26f0187c05937bcae4ef06cd56d3b20a641d23e676716c13e4b535d89c6d883d9bc3fb03fd76c8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0ad069a4065de030f68087a45e3b0d8e0d0053d916ca6e768a3ba8c02b924fed4880336eb96bfd49faff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdae8635a48ba5651cc287a64b0d6da312c0bbfd147d208c0ec5e609928f5820a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x264bb4b2a0f128002f51a5c5616197ee3ef18bcb79fd9c8bd1cf1db5d17eed23",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ee52",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a421ae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a6000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x088791"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawBalanceGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawBalanceGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xee52",
+                    "hash" : "0x10fac88baf736e30e127be3001c9adb3d0e43253b9fbe2b8c130480c4686cea1",
+                    "mixHash" : "0x54e38ab6a12b1a5f6eeab9977bbce61513d1843ebb31028c1db1646fe284b9a5",
+                    "nonce" : "0xeaa6f6055af05a5d",
+                    "number" : "0x01",
+                    "parentHash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
+                    "receiptTrie" : "0xa2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbea",
+                    "stateRoot" : "0x6b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baee",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a01514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b6985f497a0d06f61e95953f023833afd783a6e0f4dbbed838fc84ac525baeea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a2f70d2e6778413fc7e9746c18f40d45c39b431380c8290cfef34bdeb68ccbeab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a054e38ab6a12b1a5f6eeab9977bbce61513d1843ebb31028c1db1646fe284b9a588eaa6f6055af05a5df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1514985d25774037ed3f8bfe125ce9d7ad0321dc64acae8b359bc7877200a742",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7963b78ef577575a057f2d1bf61a2ab5cdaa51a00fb9a4045e60d997d712760a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x10fac88baf736e30e127be3001c9adb3d0e43253b9fbe2b8c130480c4686cea1",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee52",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0.json
index 7f514ba0e..66c16237a 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasAsk_d0g0v0_EIP150" : {
+    "RawCallCodeGasAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0x469d67fdbc7016538f84a702083068fc6cd54efe1328e8b3c607f581a3d3d8bb",
-                    "mixHash" : "0xb3705a1688a081d9dd05b4927201a738710aef38cbf8a3ef657e9daf2b95484f",
-                    "nonce" : "0x2af510d7066c5829",
+                    "hash" : "0x4e690e622e899909add30bf6aaf9c6a97533282544cb8cd5ef0bbcfc9a3d8b7d",
+                    "mixHash" : "0xcfa17e7a280c1ea7793d3fe9b40ed746f1507c575d95008deeeb5e42f9b7abec",
+                    "nonce" : "0x46bb8f1ef0ab1c3d",
                     "number" : "0x01",
                     "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
-                    "receiptTrie" : "0x49837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241",
-                    "stateRoot" : "0x18bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xf468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da049837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0b3705a1688a081d9dd05b4927201a738710aef38cbf8a3ef657e9daf2b95484f882af510d7066c5829f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0cfa17e7a280c1ea7793d3fe9b40ed746f1507c575d95008deeeb5e42f9b7abec8846bb8f1ef0ab1c3df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x469d67fdbc7016538f84a702083068fc6cd54efe1328e8b3c607f581a3d3d8bb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4e690e622e899909add30bf6aaf9c6a97533282544cb8cd5ef0bbcfc9a3d8b7d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasAsk_d0g0v0_EIP158" : {
+    "RawCallCodeGasAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xe26c12c37cb26ffb2e8045e88fc29ebcd560fd204ff837c568ad3e580bda3cec",
-                    "mixHash" : "0xc44a4567c20c32760de696a38138387a71a8a7058d80d634de3b5d4ce335f273",
-                    "nonce" : "0xf05d1dbb66bd0414",
+                    "hash" : "0xfc8c5ad630c16ed13641ecde0e6773552db73ed8d1e3395d8b20ff153ef5a609",
+                    "mixHash" : "0xb8c9475e82257ae698f4fcf19a985ca279fcf92c1600f5547b86f32b4c740544",
+                    "nonce" : "0x3d3b64efcd628b45",
+                    "number" : "0x01",
+                    "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xf468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0b8c9475e82257ae698f4fcf19a985ca279fcf92c1600f5547b86f32b4c740544883d3b64efcd628b45f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfc8c5ad630c16ed13641ecde0e6773552db73ed8d1e3395d8b20ff153ef5a609",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9",
+                    "0x02" : "0x06e228"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x7a9c24fc91742b313b5623d9643cbf8e8c5acfdd4bf3101097b8c59ac38b2f08",
+                    "mixHash" : "0x3dcfa087f7ce125ae0194fb173cddacea53d09f7a792cb29e3da14356ba28dfa",
+                    "nonce" : "0x342f5051f12febc9",
                     "number" : "0x01",
                     "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
                     "receiptTrie" : "0x49837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da049837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0c44a4567c20c32760de696a38138387a71a8a7058d80d634de3b5d4ce335f27388f05d1dbb66bd0414f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da049837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a03dcfa087f7ce125ae0194fb173cddacea53d09f7a792cb29e3da14356ba28dfa88342f5051f12febc9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26c12c37cb26ffb2e8045e88fc29ebcd560fd204ff837c568ad3e580bda3cec",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7a9c24fc91742b313b5623d9643cbf8e8c5acfdd4bf3101097b8c59ac38b2f08",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasAsk_d0g0v0_Frontier" : {
+    "RawCallCodeGasAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0x9869eb9bae1e0d20102ac670a63c56849c5d241c948c43a07a828955f3e88b84",
-                    "mixHash" : "0x30b87e8fa4f2090253819c991150d349e6b6cc2704d6f19e6e2e5c2f09f003c3",
-                    "nonce" : "0x3b4c399217519620",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x2bec2e4550eb3ce271171aec992d4c02cde7504ab9eaef42ae870822c156a1d8",
+                    "mixHash" : "0x2aa8428683cda6f314ffa76b77cdf08d04428d4a669537a1a62b8296ce412ad5",
+                    "nonce" : "0xdf868e135ae9d906",
                     "number" : "0x01",
                     "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
-                    "receiptTrie" : "0xcc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8",
-                    "stateRoot" : "0xfc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1",
+                    "receiptTrie" : "0x49837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241",
+                    "stateRoot" : "0x18bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a030b87e8fa4f2090253819c991150d349e6b6cc2704d6f19e6e2e5c2f09f003c3883b4c399217519620f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018bdc4a4f52b64081389500b23e2352e20f67bb3f83cd3b53c71bfc840af8642a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da049837c04dbcb08d193ef2e40acb79194585ef3cd420f97bd8c1a7added0ca241b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a02aa8428683cda6f314ffa76b77cdf08d04428d4a669537a1a62b8296ce412ad588df868e135ae9d906f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9869eb9bae1e0d20102ac670a63c56849c5d241c948c43a07a828955f3e88b84",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2bec2e4550eb3ce271171aec992d4c02cde7504ab9eaef42ae870822c156a1d8",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f53f4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3d0b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9",
+                    "0x02" : "0x06e228"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasAsk_d0g0v0_Homestead" : {
+    "RawCallCodeGasAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xb61ce514a52bc7b9f320c90b2fe83621b827daf4c331fbd36659822199b708fc",
-                    "mixHash" : "0x1ecaf1a16b4be84af522a2e2f6508a9d1d12d4399666c5ea11262a4d343667f4",
-                    "nonce" : "0xa56821db2e672d50",
+                    "hash" : "0xcb5cb54947ee88eabc30b0218ed126e2b93305512519c1bf85b49c24036021f4",
+                    "mixHash" : "0xedf905806d1b2fc1e8f7a9f9c4e8169318815d1337852f1089034644ebcfcc99",
+                    "nonce" : "0x3640cde16b8e5afb",
                     "number" : "0x01",
                     "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
                     "receiptTrie" : "0xcc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a01ecaf1a16b4be84af522a2e2f6508a9d1d12d4399666c5ea11262a4d343667f488a56821db2e672d50f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0edf905806d1b2fc1e8f7a9f9c4e8169318815d1337852f1089034644ebcfcc99883640cde16b8e5afbf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb61ce514a52bc7b9f320c90b2fe83621b827daf4c331fbd36659822199b708fc",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcb5cb54947ee88eabc30b0218ed126e2b93305512519c1bf85b49c24036021f4",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallCodeGasAsk_d0g0v0_Metropolis" : {
+    "RawCallCodeGasAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f4a",
-                    "hash" : "0x1e72a8a3b07060b83f73333a98023a4e2e0c50d473ae24c8a1ea722a87b6fcb0",
-                    "mixHash" : "0x8c7d8c5c4328e5873f39fb5c1583285a73d76f802fd8948a1e2c26764267d30d",
-                    "nonce" : "0x94c0aba187448741",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0xfb5efa35e8ec5f1061debc36dddee1c0b7e475f2977786f058f41976dc80930b",
+                    "mixHash" : "0x6a3593b1a3be1b8f0bd6a4c2ade781819848e1c70490778047f09ea21a2e524a",
+                    "nonce" : "0x38ee714f67ff9248",
                     "number" : "0x01",
                     "parentHash" : "0x44828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928",
-                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
-                    "stateRoot" : "0xf468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0",
+                    "receiptTrie" : "0xcc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8",
+                    "stateRoot" : "0xfc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f468caf3edd6caef8f923079d44ca8169e68ca76a3a8f7dc6973b06310f090d0a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a08c7d8c5c4328e5873f39fb5c1583285a73d76f802fd8948a1e2c26764267d30d8894c0aba187448741f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a044828bb2cf3f3bfac6d2e0b1dcf9734c0b150251acc26582fd70ef2304f60928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc05adbdfdd858033d167be322b51d1da6a4d6da428453ea552b0b8d6758c1d1a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc976c8b47425ee91c31d033f30532d30f08545579a456f5fcc036b44d8e19f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a06a3593b1a3be1b8f0bd6a4c2ade781819848e1c70490778047f09ea21a2e524a8838ee714f67ff9248f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c31206bc15277b72216c7ef9ed93842cbd9cc63b884adbaaa80dc6e35e4f82a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e72a8a3b07060b83f73333a98023a4e2e0c50d473ae24c8a1ea722a87b6fcb0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfb5efa35e8ec5f1061debc36dddee1c0b7e475f2977786f058f41976dc80930b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f4a",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b6",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06aff9",
-                    "0x02" : "0x06e228"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0.json
index 688bb99a5..ea90eca36 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasMemoryAsk_d0g0v0_EIP150" : {
+    "RawCallCodeGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x75d0791bfa73033897df011af36bedd41816cf2ae5a7cc6fe90647ab3e40b806",
-                    "mixHash" : "0x43ca0b4719e83442c1ee71230c8a6cd48047392bb5932258436b8f632b602436",
-                    "nonce" : "0x1c4ec2b97b986361",
+                    "hash" : "0x410761083b585476f2b733edcab63263fda3e052ec8a890baeb93728d84a6bf4",
+                    "mixHash" : "0x5cb3233cadbc59463dc1407e39ea95556fb04654dfe4a741e3dca817f7e336b1",
+                    "nonce" : "0x268deac002879202",
                     "number" : "0x01",
                     "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
-                    "receiptTrie" : "0x0753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235",
-                    "stateRoot" : "0x9f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da00753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a043ca0b4719e83442c1ee71230c8a6cd48047392bb5932258436b8f632b602436881c4ec2b97b986361f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1ea0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a05cb3233cadbc59463dc1407e39ea95556fb04654dfe4a741e3dca817f7e336b188268deac002879202f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75d0791bfa73033897df011af36bedd41816cf2ae5a7cc6fe90647ab3e40b806",
-        "network" : "EIP150",
+        "lastblockhash" : "0x410761083b585476f2b733edcab63263fda3e052ec8a890baeb93728d84a6bf4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasMemoryAsk_d0g0v0_EIP158" : {
+    "RawCallCodeGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x149eca2eae58d7859ac02a7bd986d0f75c4333d9298492449de2277d32870968",
-                    "mixHash" : "0xa96e6f5c03494ceb1514ccf4c53f213c8bcdecc274cb552ac1807b400e655275",
-                    "nonce" : "0x6d5bc07aa54f12e3",
+                    "hash" : "0x87b2a384c8601d758c755af40df1339c863aac60931f4d0999e3d4718c01a489",
+                    "mixHash" : "0xc8ba7d259c5ba021813ab5c0eaa5053d93c71e81b3799101095cbfffa5ee9d69",
+                    "nonce" : "0x9052ce31e0183744",
+                    "number" : "0x01",
+                    "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1ea0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0c8ba7d259c5ba021813ab5c0eaa5053d93c71e81b3799101095cbfffa5ee9d69889052ce31e0183744f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65db",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x87b2a384c8601d758c755af40df1339c863aac60931f4d0999e3d4718c01a489",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f542b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3cd4e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91",
+                    "0x02" : "0x06dece"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasMemoryAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0x248560943ec16eb7ea16f9545bc8a871b55ad773c9b4ec97af35a266c4fe46de",
+                    "mixHash" : "0x35d6b3a95f218cd53278e531a56d4ef468e8d1448f70e4464a76a7ffab70f958",
+                    "nonce" : "0xc0a78f0686cfdb09",
                     "number" : "0x01",
                     "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
                     "receiptTrie" : "0x0753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da00753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0a96e6f5c03494ceb1514ccf4c53f213c8bcdecc274cb552ac1807b400e655275886d5bc07aa54f12e3f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da00753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a035d6b3a95f218cd53278e531a56d4ef468e8d1448f70e4464a76a7ffab70f95888c0a78f0686cfdb09f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x149eca2eae58d7859ac02a7bd986d0f75c4333d9298492449de2277d32870968",
-        "network" : "EIP158",
+        "lastblockhash" : "0x248560943ec16eb7ea16f9545bc8a871b55ad773c9b4ec97af35a266c4fe46de",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasMemoryAsk_d0g0v0_Frontier" : {
+    "RawCallCodeGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xb0870c99a110ec4dbeec8eafa6fa192d76971b638360973be108b26526d51c14",
-                    "mixHash" : "0x8aaa867aff756e10f78a381abdb45b80088566eecfcfab0473b0e5cbbae6a080",
-                    "nonce" : "0xa7550d3a52b1d253",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0xc0963d28ab1b876a592b8a90cec9dd976ed63c4b539a00998bb5797cfc6b76d7",
+                    "mixHash" : "0x75226a846636cc9e3f649335f4af66f7c1241d50e2581d3f902026a6657f842a",
+                    "nonce" : "0x73105cf08c177c9a",
                     "number" : "0x01",
                     "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
-                    "receiptTrie" : "0xb730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4",
-                    "stateRoot" : "0xb37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482b",
+                    "receiptTrie" : "0x0753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235",
+                    "stateRoot" : "0x9f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a08aaa867aff756e10f78a381abdb45b80088566eecfcfab0473b0e5cbbae6a08088a7550d3a52b1d253f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f1191c22123f7a8f826a56c95729e8f269dc65ded294392ad563821c23c8098a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da00753acedec86de96d2afd9ae5e8231f71ddbb3ae845af7fd07c53ea0bbf8e235b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a075226a846636cc9e3f649335f4af66f7c1241d50e2581d3f902026a6657f842a8873105cf08c177c9af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0870c99a110ec4dbeec8eafa6fa192d76971b638360973be108b26526d51c14",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc0963d28ab1b876a592b8a90cec9dd976ed63c4b539a00998bb5797cfc6b76d7",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f542b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3cd4e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91",
+                    "0x02" : "0x06dece"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasMemoryAsk_d0g0v0_Homestead" : {
+    "RawCallCodeGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xbb67c5ee6213436f3f2abc233167296707b77f50ef8f525fada082aeb0e71033",
-                    "mixHash" : "0xebb1b09a8a0ef6829a9428530f8671636e5ebc219e0d28661baf064b7e494c94",
-                    "nonce" : "0x244365f95dc8e331",
+                    "hash" : "0x5d3498b3631e3fdf0dbc7183ebf869dec33af01a51195a290102e67123c77413",
+                    "mixHash" : "0xecdcf14bdafd346f096d5c7dd198eb6227a7305038373158c29f1160c8d75311",
+                    "nonce" : "0x9a0576bb63f2427f",
                     "number" : "0x01",
                     "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
                     "receiptTrie" : "0xb730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0ebb1b09a8a0ef6829a9428530f8671636e5ebc219e0d28661baf064b7e494c9488244365f95dc8e331f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0ecdcf14bdafd346f096d5c7dd198eb6227a7305038373158c29f1160c8d75311889a0576bb63f2427ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb67c5ee6213436f3f2abc233167296707b77f50ef8f525fada082aeb0e71033",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5d3498b3631e3fdf0dbc7183ebf869dec33af01a51195a290102e67123c77413",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallCodeGasMemoryAsk_d0g0v0_Metropolis" : {
+    "RawCallCodeGasMemoryAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142b2",
-                    "hash" : "0x28b2127adbd496cbbbe0e066d79c54b31bff576f120136694f86721bdd21bdda",
-                    "mixHash" : "0xfa44df433078f3de1151a10db5097d8bf76eca6424645c8d977d51a0a620f12f",
-                    "nonce" : "0x5986104d9cd07283",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x91990b515bb4477d7ad00a3aa520fffae72729deb100c7c236181f0c71425198",
+                    "mixHash" : "0x38e5a419dc6d620d604afa1db04bd828a53229c6cdc316393d75df4db9f9d7b2",
+                    "nonce" : "0x1eec120f245cbce6",
                     "number" : "0x01",
                     "parentHash" : "0x8b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5",
-                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
-                    "stateRoot" : "0x491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1e",
+                    "receiptTrie" : "0xb730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4",
+                    "stateRoot" : "0xb37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0491a00cdede1c4ce02b8b40e9727e9623fba1ff4bc6060ca8bda70fe2da74c1ea0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0fa44df433078f3de1151a10db5097d8bf76eca6424645c8d977d51a0a620f12f885986104d9cd07283f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08b45acf84211150b95c3016c950c125f41a775a1fdb5adc13bcc52f6f46541a5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b37c5230368f9f569a74d8a01d3786c210afa20ccaeef45db3072009f4d1482ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b730d87e4369be47cf38a05127c49b530740e45ed6cfb1bc130dfb25813c41f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a038e5a419dc6d620d604afa1db04bd828a53229c6cdc316393d75df4db9f9d7b2881eec120f245cbce6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c454d4ee5b298a3a5a4652e0ad2c3141043298c19c9136fe1420f3eb92fe65dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28b2127adbd496cbbbe0e066d79c54b31bff576f120136694f86721bdd21bdda",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x91990b515bb4477d7ad00a3aa520fffae72729deb100c7c236181f0c71425198",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542b2",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd4e",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06ac91",
-                    "0x02" : "0x06dece"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0.json
index 882677029..9b291e8c4 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasMemory_d0g0v0_EIP150" : {
+    "RawCallCodeGasMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x692152d0bea91bf3f9b639090c0166728944bb7bc222536f90f814c757b77fab",
-                    "mixHash" : "0x391d32409dd6458c0e5256197b188983e4a3ef8cc8ac8f187332fb588f85108b",
-                    "nonce" : "0x941fb4f74ff774c8",
+                    "hash" : "0xe32e457d5c8c60dd839e4fca4fcd6632fb9553324e6cbb553682fdf608c14701",
+                    "mixHash" : "0x035598c817e0c733b75a23e354b20e8afdb5d931f9e917c5ba3150503c2669a7",
+                    "nonce" : "0xcea898ee1033ba3d",
                     "number" : "0x01",
                     "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
-                    "receiptTrie" : "0x3b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185",
-                    "stateRoot" : "0xb4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x6763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0391d32409dd6458c0e5256197b188983e4a3ef8cc8ac8f187332fb588f85108b88941fb4f74ff774c8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0035598c817e0c733b75a23e354b20e8afdb5d931f9e917c5ba3150503c2669a788cea898ee1033ba3df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x692152d0bea91bf3f9b639090c0166728944bb7bc222536f90f814c757b77fab",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe32e457d5c8c60dd839e4fca4fcd6632fb9553324e6cbb553682fdf608c14701",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasMemory_d0g0v0_EIP158" : {
+    "RawCallCodeGasMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x5e890e1d00ab048a9ed4ebaf7160fbe956a9a49afa667a1df954e1285f580053",
-                    "mixHash" : "0xc8b88f8b91465ad4a39d691c997372e232d0e15e292c777e3c34216d9f1b0ccb",
-                    "nonce" : "0x39dc7967c8708eac",
+                    "hash" : "0xaf2ccc5167719dcf018f080f6dd6c761ce2112a19086a424f549f9b279ce1c79",
+                    "mixHash" : "0x95b2f26d0b0f0d698a225e1407b5ff5d7031ad74e0383a1472870a1f973aadd2",
+                    "nonce" : "0x97d615fc022eb989",
+                    "number" : "0x01",
+                    "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x6763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a095b2f26d0b0f0d698a225e1407b5ff5d7031ad74e0383a1472870a1f973aadd28897d615fc022eb989f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaf2ccc5167719dcf018f080f6dd6c761ce2112a19086a424f549f9b279ce1c79",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f542b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3cd4e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91",
+                    "0x02" : "0x752e"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasMemory_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0xbd0feb180fae48a1708006372a9cab6b5a59191d922f0bbe934246491d65e42e",
+                    "mixHash" : "0xdea2fcaba977c08d8d6c047e2f4fbed03f22d6c5b28790f0a51ec69873c36b86",
+                    "nonce" : "0x9e55c883e1d53bbf",
                     "number" : "0x01",
                     "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
                     "receiptTrie" : "0x3b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0c8b88f8b91465ad4a39d691c997372e232d0e15e292c777e3c34216d9f1b0ccb8839dc7967c8708eacf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0dea2fcaba977c08d8d6c047e2f4fbed03f22d6c5b28790f0a51ec69873c36b86889e55c883e1d53bbff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e890e1d00ab048a9ed4ebaf7160fbe956a9a49afa667a1df954e1285f580053",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbd0feb180fae48a1708006372a9cab6b5a59191d922f0bbe934246491d65e42e",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasMemory_d0g0v0_Frontier" : {
+    "RawCallCodeGasMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01401e",
-                    "hash" : "0xdc66d9b295b3018c4ba6a444dd15987ed920d83708ce2dfe7833791eb012d45d",
-                    "mixHash" : "0x156070859c16f3e172a6476faa6a941b4161e4b865622e2ea85f235a8d708044",
-                    "nonce" : "0xaafcc999ef1bb470",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0x6e029c0f9b8b5c52e995f09a14841bfefcf782613b48755bcfd866bf1209a6c7",
+                    "mixHash" : "0xf387038b362ccf6610419c013b88bb72308336079bc954b4cd9788618510bd8c",
+                    "nonce" : "0x1bda9cf8294e08f7",
                     "number" : "0x01",
                     "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
-                    "receiptTrie" : "0x84c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fcc",
-                    "stateRoot" : "0x7c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3",
+                    "receiptTrie" : "0x3b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185",
+                    "stateRoot" : "0xb4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da084c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a0156070859c16f3e172a6476faa6a941b4161e4b865622e2ea85f235a8d70804488aafcc999ef1bb470f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4fa812366aabbbf8fd8479bcc85e21876f3c761ed0a62c090b3e348412b4f23a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03b37c6d0a51f3daaca8d70bf5944186b1f16dd87395df7468f241b2346322185b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0f387038b362ccf6610419c013b88bb72308336079bc954b4cd9788618510bd8c881bda9cf8294e08f7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc66d9b295b3018c4ba6a444dd15987ed920d83708ce2dfe7833791eb012d45d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6e029c0f9b8b5c52e995f09a14841bfefcf782613b48755bcfd866bf1209a6c7",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5401e",
+                "balance" : "0x4563918244f542b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cfe2",
+                "balance" : "0xe8d4a3cd4e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -336,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06af25",
+                    "0x01" : "0x06ac91",
                     "0x02" : "0x752e"
                 }
             }
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasMemory_d0g0v0_Homestead" : {
+    "RawCallCodeGasMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01401e",
-                    "hash" : "0xb4cd13ba8b450039309248ef3342e4ebf0dc6fb6b3aff01bdd95b9205219f01b",
-                    "mixHash" : "0xef578ca9a265f9942ec969ec828b0bd1ef4e96de667517351dc82add998694f2",
-                    "nonce" : "0x8d0a32696685a6f2",
+                    "hash" : "0xd0755ebda985ef6e905e62b4d4a0713b751f761d37c0bb1ac1602f4c544f4272",
+                    "mixHash" : "0x6e78669e18363b75b998ee3210f2172e4b837deea57a91ea619455477b963435",
+                    "nonce" : "0xe45e3422fbf68753",
                     "number" : "0x01",
                     "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
                     "receiptTrie" : "0x84c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fcc",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da084c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a0ef578ca9a265f9942ec969ec828b0bd1ef4e96de667517351dc82add998694f2888d0a32696685a6f2f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da084c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a06e78669e18363b75b998ee3210f2172e4b837deea57a91ea619455477b96343588e45e3422fbf68753f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4cd13ba8b450039309248ef3342e4ebf0dc6fb6b3aff01bdd95b9205219f01b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd0755ebda985ef6e905e62b4d4a0713b751f761d37c0bb1ac1602f4c544f4272",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallCodeGasMemory_d0g0v0_Metropolis" : {
+    "RawCallCodeGasMemory_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142b2",
-                    "hash" : "0x074e2900fcafefbd10e202f877b1d774cfdd12ff283b8605d961554bde707aee",
-                    "mixHash" : "0x4a348da1172c2773ce2446b10532a713f73c730a4cb6c4a49afc314c91e42e56",
-                    "nonce" : "0x1650e37043343225",
+                    "gasUsed" : "0x01401e",
+                    "hash" : "0x16b110aea896e4335f9be3502310d804bc048504941f58db232e1b10060e1af6",
+                    "mixHash" : "0x32ceb0a97cd07349c8f90621a4fb31f62d3224e7059027509f518fc0f776f919",
+                    "nonce" : "0x5fafc33e22269bd6",
                     "number" : "0x01",
                     "parentHash" : "0x10b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4",
-                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
-                    "stateRoot" : "0x6763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065",
+                    "receiptTrie" : "0x84c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fcc",
+                    "stateRoot" : "0x7c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06763e4f8a071d93c81f15785a396e3f400ca888b567246597155bbe6f7351065a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a04a348da1172c2773ce2446b10532a713f73c730a4cb6c4a49afc314c91e42e56881650e37043343225f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a010b0236b740dc0c562da9c13b510f6728c72c7f0d6b20d6679f1e2e1507f70a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c08eb7d717ad9dba0bbe6b9f46958ca6971459273d3cff60922399b8393f0c3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da084c7ac8542ec12282abcb26c51e2c5cd6fe8eff498dd16101167e2c074088fccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a032ceb0a97cd07349c8f90621a4fb31f62d3224e7059027509f518fc0f776f919885fafc33e22269bd6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b71aef4e003c1de23e52fbde9cb0220ec48c636d1aed13b4a5b049190ea9c09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x074e2900fcafefbd10e202f877b1d774cfdd12ff283b8605d961554bde707aee",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x16b110aea896e4335f9be3502310d804bc048504941f58db232e1b10060e1af6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -568,14 +697,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542b2",
+                "balance" : "0x4563918244f5401e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd4e",
+                "balance" : "0xe8d4a3cfe2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -587,7 +716,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06ac91",
+                    "0x01" : "0x06af25",
                     "0x02" : "0x752e"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0.json
index b90c3b791..f562f0421 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasValueTransferAsk_d0g0v0_EIP150" : {
+    "RawCallCodeGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0x60a3857a77e0bc051996e2a9a6922b3bb57cfd9afaea7a888f2b50f63737f7b1",
-                    "mixHash" : "0xd3430cec72ac62579cd34fdb86e140677d526add7fd4f874950ed88cc1e919fd",
-                    "nonce" : "0xf982770c1674e43a",
+                    "hash" : "0x23531aebaf234f95977cf2759f2c089abb66e5909b020e465e16635445dc515c",
+                    "mixHash" : "0x5692bbc49705b9420e013b1679b11478e75c146d3210e3efe10af8d5fbbffe56",
+                    "nonce" : "0x1be5c3015877090f",
                     "number" : "0x01",
                     "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
-                    "receiptTrie" : "0x18052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104",
-                    "stateRoot" : "0x830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0xe56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a018052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0d3430cec72ac62579cd34fdb86e140677d526add7fd4f874950ed88cc1e919fd88f982770c1674e43af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a05692bbc49705b9420e013b1679b11478e75c146d3210e3efe10af8d5fbbffe56881be5c3015877090ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60a3857a77e0bc051996e2a9a6922b3bb57cfd9afaea7a888f2b50f63737f7b1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x23531aebaf234f95977cf2759f2c089abb66e5909b020e465e16635445dc515c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferAsk_d0g0v0_EIP158" : {
+    "RawCallCodeGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0x5cb4ed3af87814358e76bb653d9fddb2c75152febc12caabbe420577f0f80177",
-                    "mixHash" : "0x705a198294be1ce8918f4946ffbbde0ae237f3820c066f33421c29191aec3e57",
-                    "nonce" : "0x9094ab7bceb9a29b",
+                    "hash" : "0xc42ca14d74782f0140bec54380f46e48843a920037e91d945a63a3de8cd0160b",
+                    "mixHash" : "0x70d51c2ac4ef16e4519feba9a64de4d2923936244ae6b136ec655b6385ddc9c0",
+                    "nonce" : "0x6080653dd7837b5f",
+                    "number" : "0x01",
+                    "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0xe56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a070d51c2ac4ef16e4519feba9a64de4d2923936244ae6b136ec655b6385ddc9c0886080653dd7837b5ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc42ca14d74782f0140bec54380f46e48843a920037e91d945a63a3de8cd0160b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b680",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd",
+                    "0x02" : "0x06c889"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasValueTransferAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0xf73486d3df2bec3721a0fb0e106a84a5210a6257820f4d54fb9fd6c7b9eff893",
+                    "mixHash" : "0xac088ec035a25d44ef74a63f529645b96d93dd13ca3d039d43930a3067f40699",
+                    "nonce" : "0x14ea90a8f705b121",
                     "number" : "0x01",
                     "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
                     "receiptTrie" : "0x18052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a018052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0705a198294be1ce8918f4946ffbbde0ae237f3820c066f33421c29191aec3e57889094ab7bceb9a29bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a018052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0ac088ec035a25d44ef74a63f529645b96d93dd13ca3d039d43930a3067f406998814ea90a8f705b121f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cb4ed3af87814358e76bb653d9fddb2c75152febc12caabbe420577f0f80177",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf73486d3df2bec3721a0fb0e106a84a5210a6257820f4d54fb9fd6c7b9eff893",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferAsk_d0g0v0_Frontier" : {
+    "RawCallCodeGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xa83ae79f6a79bfc20d0f404b1d5bb8cc5503d08105fec365f3366cc0145858f4",
-                    "mixHash" : "0xf328c505273872dab3a2910d7c5e6f4d7e69390cc9701b69af8ba0f37494866b",
-                    "nonce" : "0x9d087115b0eb7a32",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0x894cbd79e2e2b0c8298d83fd1df83f151600a075960abf67b557c7421a6fc140",
+                    "mixHash" : "0x15c5de318ef047a43054f91bbec4cc8fd27db4055fc29faad38b40d829567dec",
+                    "nonce" : "0x2ae35980be622b16",
                     "number" : "0x01",
                     "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
-                    "receiptTrie" : "0xbbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64",
-                    "stateRoot" : "0x7c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87",
+                    "receiptTrie" : "0x18052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104",
+                    "stateRoot" : "0x830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0bbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0f328c505273872dab3a2910d7c5e6f4d7e69390cc9701b69af8ba0f37494866b889d087115b0eb7a32f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dc475adccd0226ddcac1512445723e05a20e3b84eb225ee98e2748f0ce445a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a018052b199a911dbf8a7338583208c7918bd7a8f453b6d2c450da070b920d9104b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a015c5de318ef047a43054f91bbec4cc8fd27db4055fc29faad38b40d829567dec882ae35980be622b16f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa83ae79f6a79bfc20d0f404b1d5bb8cc5503d08105fec365f3366cc0145858f4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x894cbd79e2e2b0c8298d83fd1df83f151600a075960abf67b557c7421a6fc140",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,24 +453,27 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f55976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3b680",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd",
+                    "0x02" : "0x06c889"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferAsk_d0g0v0_Homestead" : {
+    "RawCallCodeGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xe1bc803652424432761075288163efe0dd58822dad9667029b7f48f6f871a49e",
-                    "mixHash" : "0xd7decbc4142eac73bb9e07c465be636879a7d6f0787afc94cada7f397aff4758",
-                    "nonce" : "0xfb611c404944f72f",
+                    "hash" : "0x9185ff0430f4e6ca54b3e90169671ffdcebb707cfd3c4fcda6835b9e1fe1cc50",
+                    "mixHash" : "0xd281a464932fe39d27e3d6b4a85f83a8496281141803bd9095ba1ead77c9f1b7",
+                    "nonce" : "0xcb0520dae153f6d7",
                     "number" : "0x01",
                     "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
                     "receiptTrie" : "0xbbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0bbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0d7decbc4142eac73bb9e07c465be636879a7d6f0787afc94cada7f397aff475888fb611c404944f72ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0bbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0d281a464932fe39d27e3d6b4a85f83a8496281141803bd9095ba1ead77c9f1b788cb0520dae153f6d7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1bc803652424432761075288163efe0dd58822dad9667029b7f48f6f871a49e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9185ff0430f4e6ca54b3e90169671ffdcebb707cfd3c4fcda6835b9e1fe1cc50",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferAsk_d0g0v0_Metropolis" : {
+    "RawCallCodeGasValueTransferAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015976",
-                    "hash" : "0x8eff2ce0b0f0ff50d0094c7674c2e34731cb43f34ee54b522a285461ee6f053d",
-                    "mixHash" : "0x686e5f8af724e9173a87311146937681597bc6889ad9b92e22060c10c14d8baf",
-                    "nonce" : "0xa77aec1983c59b33",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x6ccbf5123abaab03a398183b7ea6d9003db0c24d42e3f69b3df16d0ab526068d",
+                    "mixHash" : "0xe476b22e1f6e0ce7b0cddfdb95b34c3039f90afe3476ce70b5de8305005eec6a",
+                    "nonce" : "0xbee77a0a17cb6d17",
                     "number" : "0x01",
                     "parentHash" : "0x686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5",
-                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
-                    "stateRoot" : "0xe56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07",
+                    "receiptTrie" : "0xbbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64",
+                    "stateRoot" : "0x7c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56e1a5fc8938183f977f9dee8f109405959f94099d8aefaf3603a80dbc1fd07a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0686e5f8af724e9173a87311146937681597bc6889ad9b92e22060c10c14d8baf88a77aec1983c59b33f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0686b41b1b5b90d21b745637204068cfaf94c674acaf81ec2a95e3caf347c02b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c987209a240fa8d5e365ed2c8a2fbfe25b5ff89c3b6071154d95b080e995a87a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0bbd35c2c2df48f92d2ed3254fbf54a2bafe691b446a2fe988071d4aa73182c64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0e476b22e1f6e0ce7b0cddfdb95b34c3039f90afe3476ce70b5de8305005eec6a88bee77a0a17cb6d17f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bea07ffb5d7bc315159ec2249ae85d29a4673cac5c6ef6b6e21bc329985301c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8eff2ce0b0f0ff50d0094c7674c2e34731cb43f34ee54b522a285461ee6f053d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6ccbf5123abaab03a398183b7ea6d9003db0c24d42e3f69b3df16d0ab526068d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,27 +694,24 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55976",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b680",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x0695cd",
-                    "0x02" : "0x06c889"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0.json
index 113ee1f7d..7011b25a3 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_EIP150" : {
+    "RawCallCodeGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xb58975b44d7233be0a8bd22a751b630017f4127906dcec947a2d0727d249cba2",
-                    "mixHash" : "0x5a5ebe49f16695eb52eae0a49d62a59b9f1c6abeb053ca3d0a0e529ecebb2adb",
-                    "nonce" : "0x22dc687c2388e76a",
+                    "hash" : "0x323f0a8c626a303d43e7079ae20bd9c8f98848c13bfdd2a0345abfdee198d8e9",
+                    "mixHash" : "0x6e41b1d17faf995730ad537d64019b7690ac6a85567091f80b4bf182c9828018",
+                    "nonce" : "0x7f8759e4be61eab2",
                     "number" : "0x01",
                     "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
-                    "receiptTrie" : "0x52e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803",
-                    "stateRoot" : "0xf4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xdd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a052e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a05a5ebe49f16695eb52eae0a49d62a59b9f1c6abeb053ca3d0a0e529ecebb2adb8822dc687c2388e76af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a06e41b1d17faf995730ad537d64019b7690ac6a85567091f80b4bf182c9828018887f8759e4be61eab2f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb58975b44d7233be0a8bd22a751b630017f4127906dcec947a2d0727d249cba2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x323f0a8c626a303d43e7079ae20bd9c8f98848c13bfdd2a0345abfdee198d8e9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_EIP158" : {
+    "RawCallCodeGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xa603d8d05b3cb9ebe53b67e09593f16a89944fcf64c1415f6ce36965bf16ca7c",
-                    "mixHash" : "0x6d1a5afdffb1c51715ba17136014d9d1a364426aaa03aad8a09aa459e0d934f3",
-                    "nonce" : "0x708a57d54a59999c",
+                    "hash" : "0x1824e9f54656d99e3f98e24df950605807e825406dda4bfbc6378a5820589307",
+                    "mixHash" : "0xd8e3fdba7880aa0c3e1719cd68bf03e065f72730133799910e239cbbf0fd9a5f",
+                    "nonce" : "0x3789765d96db4d31",
+                    "number" : "0x01",
+                    "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xdd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0d8e3fdba7880aa0c3e1719cd68bf03e065f72730133799910e239cbbf0fd9a5f883789765d96db4d31f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x71c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1824e9f54656d99e3f98e24df950605807e825406dda4bfbc6378a5820589307",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55cde",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b318",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265",
+                    "0x02" : "0x06c52e"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0x0303c55e3e2ebef8f11f5c40f1eb81f6fe4114ca121c94befa6d4b2d62a0a1a2",
+                    "mixHash" : "0x941c66bfb14ee8337d9500a4e4326654cd9451f5051a5a16dc2d6357f20a6810",
+                    "nonce" : "0x85fc57542de1397b",
                     "number" : "0x01",
                     "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
                     "receiptTrie" : "0x52e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a052e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a06d1a5afdffb1c51715ba17136014d9d1a364426aaa03aad8a09aa459e0d934f388708a57d54a59999cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a052e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0941c66bfb14ee8337d9500a4e4326654cd9451f5051a5a16dc2d6357f20a68108885fc57542de1397bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa603d8d05b3cb9ebe53b67e09593f16a89944fcf64c1415f6ce36965bf16ca7c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0303c55e3e2ebef8f11f5c40f1eb81f6fe4114ca121c94befa6d4b2d62a0a1a2",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_Frontier" : {
+    "RawCallCodeGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xb3d87800c47b47ac52390b3c96b85041ca7c0bae8b6f1bad3f01185ef4ca1ffc",
-                    "mixHash" : "0xcc7f12485ae0fdc3998b6bed2f1890170fba7b25d88c737ce7f1f9ca23882b01",
-                    "nonce" : "0xd5c5bc3066a5901d",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0x320f27d6303b251ead25b54c0e2e6ed32ca2ebda7ace20b1fa48af5f772389db",
+                    "mixHash" : "0xdd75e47b6bdbde99da5b7098f341437dbbb92c098e9f1fef572288127f3b171e",
+                    "nonce" : "0xa205754d325f6620",
                     "number" : "0x01",
                     "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
-                    "receiptTrie" : "0x9e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413",
-                    "stateRoot" : "0xcea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697",
+                    "receiptTrie" : "0x52e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803",
+                    "stateRoot" : "0xf4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0cc7f12485ae0fdc3998b6bed2f1890170fba7b25d88c737ce7f1f9ca23882b0188d5c5bc3066a5901df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4814cc368c894ae629174970ffd55da71e130de3d0c634de838228906ee2235a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a052e11f2371e065d544b7a0d02b4a034cbaefd5470514a95bca58ca82535c3803b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0dd75e47b6bdbde99da5b7098f341437dbbb92c098e9f1fef572288127f3b171e88a205754d325f6620f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3d87800c47b47ac52390b3c96b85041ca7c0bae8b6f1bad3f01185ef4ca1ffc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x320f27d6303b251ead25b54c0e2e6ed32ca2ebda7ace20b1fa48af5f772389db",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,24 +453,27 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f55cde",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3b318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265",
+                    "0x02" : "0x06c52e"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_Homestead" : {
+    "RawCallCodeGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0x67d14dd551acbd4d81ee6166a344e0bc827759e6dd2bd1f68420a8a33713d175",
-                    "mixHash" : "0xfc20c012b9bb06bdddee32c642eff48c75ee49d598b97a6d816915d34af56696",
-                    "nonce" : "0xd42b79596c62623e",
+                    "hash" : "0x8e71610ff14790d9ad4fa1aa73ea8256881d147c833e2a5408fe37cc6f28ec4f",
+                    "mixHash" : "0x3099d66da9359f8388acd02451d245e989aa160adee340569cbfd1e706a32104",
+                    "nonce" : "0x756484ff14fc9390",
                     "number" : "0x01",
                     "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
                     "receiptTrie" : "0x9e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0fc20c012b9bb06bdddee32c642eff48c75ee49d598b97a6d816915d34af5669688d42b79596c62623ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a03099d66da9359f8388acd02451d245e989aa160adee340569cbfd1e706a3210488756484ff14fc9390f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67d14dd551acbd4d81ee6166a344e0bc827759e6dd2bd1f68420a8a33713d175",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8e71610ff14790d9ad4fa1aa73ea8256881d147c833e2a5408fe37cc6f28ec4f",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_Metropolis" : {
+    "RawCallCodeGasValueTransferMemoryAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015cde",
-                    "hash" : "0xe44fcfc2cbc3295df2eb8bf136e04a4cb56382677ad33f45f8e5d55f715f26d8",
-                    "mixHash" : "0x4c99e8fa604d8e8934bc0864e3a5e9aed19111ecfd52eb98703537b30d2573ff",
-                    "nonce" : "0xcd86fb2448bbf62f",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x1cd67f4186d6fdad39089c5b53e741bcb604d397614772fd18480182e086ab2c",
+                    "mixHash" : "0x99a9e4236696dcc12612e0fa0bc77be21c05a64decedc0d1aeab7507b40cb4e1",
+                    "nonce" : "0x54ce79c58bc60270",
                     "number" : "0x01",
                     "parentHash" : "0x8c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151",
-                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
-                    "stateRoot" : "0xdd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028",
+                    "receiptTrie" : "0x9e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413",
+                    "stateRoot" : "0xcea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd7b68459c1046185699c691a3a9ffcb6f98d5af8f96ac0070a4c2cc86c97028a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a04c99e8fa604d8e8934bc0864e3a5e9aed19111ecfd52eb98703537b30d2573ff88cd86fb2448bbf62ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a08c5a8f24cbb19a214dcabb1d667f073e4541e8140192b04cd868d9fe7a412151a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea282c11381c2c816e29f9ed49150cff9207b886a229d5b808b61da15291697a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09e702b54170e219ee1b2ed41e00dd4b8eccdf00230033f9b22a488f10d62f413b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a099a9e4236696dcc12612e0fa0bc77be21c05a64decedc0d1aeab7507b40cb4e18854ce79c58bc60270f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c5ef0971f2e230cb62d3ebea1a5af074df500c50778eba506257b58354a5dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe44fcfc2cbc3295df2eb8bf136e04a4cb56382677ad33f45f8e5d55f715f26d8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1cd67f4186d6fdad39089c5b53e741bcb604d397614772fd18480182e086ab2c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,27 +694,24 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55cde",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b318",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x069265",
-                    "0x02" : "0x06c52e"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0.json
index 2eed6a0b0..387e3cd6f 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasValueTransferMemory_d0g0v0_EIP150" : {
+    "RawCallCodeGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0x0f3bfc5f1e3430ad065d5d26f35b5f3502c92610e223f9b8765b935a497ccdd5",
-                    "mixHash" : "0xc9ebae7272ddee86c7e4968d361680860480290bb913997b808fed3265655e47",
-                    "nonce" : "0x699d89d2ee0f9277",
+                    "hash" : "0x0f008f74edaec51fd686569f92fabd548b419a5f84fdcd3c1b19be4185824af7",
+                    "mixHash" : "0x5bf47b1ad1b23e600a2c13a51d662f648c9b89552d303502687c589a63215c23",
+                    "nonce" : "0xb37f2b973f4e812b",
                     "number" : "0x01",
                     "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
-                    "receiptTrie" : "0x2f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5a",
-                    "stateRoot" : "0xf71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33e",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xeae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0c9ebae7272ddee86c7e4968d361680860480290bb913997b808fed3265655e4788699d89d2ee0f9277f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a05bf47b1ad1b23e600a2c13a51d662f648c9b89552d303502687c589a63215c2388b37f2b973f4e812bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f3bfc5f1e3430ad065d5d26f35b5f3502c92610e223f9b8765b935a497ccdd5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0f008f74edaec51fd686569f92fabd548b419a5f84fdcd3c1b19be4185824af7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemory_d0g0v0_EIP158" : {
+    "RawCallCodeGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0x4ea8b0e02205ae13932fbdcb2b7d589d2a1a17f87094cc202415a545b3b6ac26",
-                    "mixHash" : "0x6bc374c683b8d2893b31eb521d8b39d68f0f5e5cde9a486d305f668d554f05d9",
-                    "nonce" : "0xafb4e2fa3a9df49e",
+                    "hash" : "0x9c91f1430bc88d650290dcc58508218ca0d2ea1a99f9babcf3de11bf38b8f743",
+                    "mixHash" : "0x0d48f4e512bc299e165ea7b36fa98c35a0103fb82ebb31bf28bd7f5c8247106c",
+                    "nonce" : "0x544ded47b7fde608",
+                    "number" : "0x01",
+                    "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xeae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a00d48f4e512bc299e165ea7b36fa98c35a0103fb82ebb31bf28bd7f5c8247106c88544ded47b7fde608f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9c91f1430bc88d650290dcc58508218ca0d2ea1a99f9babcf3de11bf38b8f743",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55cde",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b318",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265",
+                    "0x02" : "0x7e2a"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasValueTransferMemory_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0xa53ee2d6a544f51029518716c3061677c52df5f444fefa9180d2a3ada62eb212",
+                    "mixHash" : "0x85732eae12eaba1c9c913359a6db4afe27269b628bbb8def16e71b647543c70f",
+                    "nonce" : "0x2f6d8d6d9bf12c83",
                     "number" : "0x01",
                     "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
                     "receiptTrie" : "0x2f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5a",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a06bc374c683b8d2893b31eb521d8b39d68f0f5e5cde9a486d305f668d554f05d988afb4e2fa3a9df49ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a085732eae12eaba1c9c913359a6db4afe27269b628bbb8def16e71b647543c70f882f6d8d6d9bf12c83f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ea8b0e02205ae13932fbdcb2b7d589d2a1a17f87094cc202415a545b3b6ac26",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa53ee2d6a544f51029518716c3061677c52df5f444fefa9180d2a3ada62eb212",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemory_d0g0v0_Frontier" : {
+    "RawCallCodeGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015a4a",
-                    "hash" : "0xb3bad08db39c51879ae0e94aa517ca1b66612d30aadcf8873c16eacd50bc8b32",
-                    "mixHash" : "0xa8135c04c8d55411f2707824e173786a749e55a2685889547aab1a182fcfa79e",
-                    "nonce" : "0xce2a19d23637c47f",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0xdfc67cf47ea9d8cf3ab67e0527c1f6b3dcbd4a26d0de0aa509c4b21a71ebdff0",
+                    "mixHash" : "0xcbfccc5bad4fb19ff6e8c07f8c718dd2fbc693859300dd7c71d21e324030f1e1",
+                    "nonce" : "0xa3da9bdca62d7389",
                     "number" : "0x01",
                     "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
-                    "receiptTrie" : "0xfba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421",
-                    "stateRoot" : "0x219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31",
+                    "receiptTrie" : "0x2f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5a",
+                    "stateRoot" : "0xf71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0fba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a0a8135c04c8d55411f2707824e173786a749e55a2685889547aab1a182fcfa79e88ce2a19d23637c47ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f71170667dccff90e323d849213851de671328f3f09127c20e6545fe298cc33ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02f3f274ff5af3c294b2b356f584d24071b501ce8fc8bfa18d61ffc4ebd409e5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0cbfccc5bad4fb19ff6e8c07f8c718dd2fbc693859300dd7c71d21e324030f1e188a3da9bdca62d7389f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3bad08db39c51879ae0e94aa517ca1b66612d30aadcf8873c16eacd50bc8b32",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdfc67cf47ea9d8cf3ab67e0527c1f6b3dcbd4a26d0de0aa509c4b21a71ebdff0",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55a4a",
+                "balance" : "0x4563918244f55cde",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b5ac",
+                "balance" : "0xe8d4a3b318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -336,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x0694f9",
+                    "0x01" : "0x069265",
                     "0x02" : "0x7e2a"
                 }
             }
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemory_d0g0v0_Homestead" : {
+    "RawCallCodeGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015a4a",
-                    "hash" : "0x3617c15094c56e5f27eb4936a937c0816aae6d50dfa380f9098b41d8f8994348",
-                    "mixHash" : "0x155b714e63a91474e5701ef7c3634ec489ed08e1e2c61dcf14aa8f50fd4e34a4",
-                    "nonce" : "0xc11bb5bc8bb94dd8",
+                    "hash" : "0x5dc91994e5ee92ba3a21582e202665dd81dcfd5aae41de090a3a5d0bd39fac7b",
+                    "mixHash" : "0x45b371e8c79fd8a9d969787ec7028dd052895140ca82d643fb2faf18b0e7a04e",
+                    "nonce" : "0xd920c4abb414badb",
                     "number" : "0x01",
                     "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
                     "receiptTrie" : "0xfba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0fba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a0155b714e63a91474e5701ef7c3634ec489ed08e1e2c61dcf14aa8f50fd4e34a488c11bb5bc8bb94dd8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0fba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a045b371e8c79fd8a9d969787ec7028dd052895140ca82d643fb2faf18b0e7a04e88d920c4abb414badbf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3617c15094c56e5f27eb4936a937c0816aae6d50dfa380f9098b41d8f8994348",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5dc91994e5ee92ba3a21582e202665dd81dcfd5aae41de090a3a5d0bd39fac7b",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransferMemory_d0g0v0_Metropolis" : {
+    "RawCallCodeGasValueTransferMemory_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015cde",
-                    "hash" : "0x2dfe0b60256fac9e080b04f01756fbd54dc95513b484f40d951f40af920ab180",
-                    "mixHash" : "0xd70d5462cf802cc13f26fef7515826b39d6ae27e18ad4872e28af53a73bcf0dd",
-                    "nonce" : "0x3be64fc269271fd5",
+                    "gasUsed" : "0x015a4a",
+                    "hash" : "0x4057db022b7c9ba4426b6f23b72f03db9b60efc78f1c74cda115067a504a524f",
+                    "mixHash" : "0x66b364f021a3375b4499271a99cc710d44186ee357fef0d9558c549b36e08d49",
+                    "nonce" : "0xd84e16014e33d698",
                     "number" : "0x01",
                     "parentHash" : "0x79f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68f",
-                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
-                    "stateRoot" : "0xeae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050f",
+                    "receiptTrie" : "0xfba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421",
+                    "stateRoot" : "0x219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eae1e96fd083d7f14ab1c868c006318574fc1dd8f949aabb868d17cf7df8050fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0d70d5462cf802cc13f26fef7515826b39d6ae27e18ad4872e28af53a73bcf0dd883be64fc269271fd5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a079f08b03b20e338d734cce212c167877ade89b0e7181b3509cc0091429dae68fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0219b9790945723ae2743f8e46077b332b0488842ca0c3a8019b251d29c08fd31a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0fba8119f6d8f2a40785af71c7936791dbda91ccbe4049611dd92bd8dd0c1d421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a066b364f021a3375b4499271a99cc710d44186ee357fef0d9558c549b36e08d4988d84e16014e33d698f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec640492af474d5aba5e1fce648e29ccbdec0ec160d9b584b4c8436a5ab0a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2dfe0b60256fac9e080b04f01756fbd54dc95513b484f40d951f40af920ab180",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4057db022b7c9ba4426b6f23b72f03db9b60efc78f1c74cda115067a504a524f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -568,14 +697,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55cde",
+                "balance" : "0x4563918244f55a4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b318",
+                "balance" : "0xe8d4a3b5ac",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -587,7 +716,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x069265",
+                    "0x01" : "0x0694f9",
                     "0x02" : "0x7e2a"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0.json
index 8aedffd8a..cce8691b1 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGasValueTransfer_d0g0v0_EIP150" : {
+    "RawCallCodeGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0xcefde10b307a906790a67c27edafad3e9ca66a2dc4f5141682458b281245fe84",
-                    "mixHash" : "0x175c3ec45929350ff5ad66bf9d0b4557c15eb289320b9b42112fe834a59af84b",
-                    "nonce" : "0x616b65dcc667e193",
+                    "hash" : "0xf95b42b31f014091f9966e657c4681412b4852f8edf87e5d3e1ab49489e93029",
+                    "mixHash" : "0x63af32067c951b95ccf249be018d416b871e45223923708e8d570c96fc0ee5da",
+                    "nonce" : "0x066cbacb1f307af0",
                     "number" : "0x01",
                     "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
-                    "receiptTrie" : "0x7eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934",
-                    "stateRoot" : "0x9b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x9f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0175c3ec45929350ff5ad66bf9d0b4557c15eb289320b9b42112fe834a59af84b88616b65dcc667e193f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a063af32067c951b95ccf249be018d416b871e45223923708e8d570c96fc0ee5da88066cbacb1f307af0f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcefde10b307a906790a67c27edafad3e9ca66a2dc4f5141682458b281245fe84",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf95b42b31f014091f9966e657c4681412b4852f8edf87e5d3e1ab49489e93029",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransfer_d0g0v0_EIP158" : {
+    "RawCallCodeGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0xa95c6e07eb2cb27bd906b9420aa646f51d7d6e5f759bb3a91b16be2dcd4cc4c0",
-                    "mixHash" : "0x4f83e808e8b4bf45868edd50522da39e791fe13dcae8d6b9e1ce3f1ad020c9e0",
-                    "nonce" : "0x927c4cedde14344f",
+                    "hash" : "0x94615af73d3711ca50bd09a878b08c9acbafe9358d9b63e8ee7e4d840a81acb1",
+                    "mixHash" : "0xb38d0849e82279c3d728a8ecff4fe337b8b7d320d02453d918e1948a92ec1f30",
+                    "nonce" : "0x48ea2a82ea423bf2",
+                    "number" : "0x01",
+                    "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x9f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0b38d0849e82279c3d728a8ecff4fe337b8b7d320d02453d918e1948a92ec1f308848ea2a82ea423bf2f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x94615af73d3711ca50bd09a878b08c9acbafe9358d9b63e8ee7e4d840a81acb1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b680",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd",
+                    "0x02" : "0x7e2a"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGasValueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0x825a010a5ad7a5611381fea127f6145295cbda5c28eac3d726319649ce63e09f",
+                    "mixHash" : "0x00cb7e9dbf95dd78bafb8a5aada0d066eac977ec450b71a7c7f725698fea637f",
+                    "nonce" : "0xc18562d15dafd6d7",
                     "number" : "0x01",
                     "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
                     "receiptTrie" : "0x7eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a04f83e808e8b4bf45868edd50522da39e791fe13dcae8d6b9e1ce3f1ad020c9e088927c4cedde14344ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a000cb7e9dbf95dd78bafb8a5aada0d066eac977ec450b71a7c7f725698fea637f88c18562d15dafd6d7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa95c6e07eb2cb27bd906b9420aa646f51d7d6e5f759bb3a91b16be2dcd4cc4c0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x825a010a5ad7a5611381fea127f6145295cbda5c28eac3d726319649ce63e09f",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransfer_d0g0v0_Frontier" : {
+    "RawCallCodeGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0156e2",
-                    "hash" : "0xe2424c9609b5d5a9a29004b5965e48d5dbb1043979a39a161b329bd6cc9b5cdf",
-                    "mixHash" : "0x5ad1e94e67ee1578eae50c60ef0a080b54f25f819fe5fc59d13b4e2d0aa021cf",
-                    "nonce" : "0x200e1e62cbf56c29",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0xdd9410bb6a08a8ddf3b7e3a51d09543121f3d6bbd5c109e834f06f1837667916",
+                    "mixHash" : "0x000556c096d0dc3f9824ccad04558e2580bb6f0dfc1819de3fe0dc11f4bf4e35",
+                    "nonce" : "0xa8aecb370a42985b",
                     "number" : "0x01",
                     "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
-                    "receiptTrie" : "0x9f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6cc",
-                    "stateRoot" : "0x1a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983",
+                    "receiptTrie" : "0x7eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934",
+                    "stateRoot" : "0x9b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a05ad1e94e67ee1578eae50c60ef0a080b54f25f819fe5fc59d13b4e2d0aa021cf88200e1e62cbf56c29f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b7afd3eddb143d3a814b435ff978d2b415880d7c5504a3de269d32d6c953117a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07eab781076788f95435650016979b85dd2aae36183b2808930f7e013db6ac934b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0000556c096d0dc3f9824ccad04558e2580bb6f0dfc1819de3fe0dc11f4bf4e3588a8aecb370a42985bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2424c9609b5d5a9a29004b5965e48d5dbb1043979a39a161b329bd6cc9b5cdf",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdd9410bb6a08a8ddf3b7e3a51d09543121f3d6bbd5c109e834f06f1837667916",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f556e2",
+                "balance" : "0x4563918244f55976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b914",
+                "balance" : "0xe8d4a3b680",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -336,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x069861",
+                    "0x01" : "0x0695cd",
                     "0x02" : "0x7e2a"
                 }
             }
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransfer_d0g0v0_Homestead" : {
+    "RawCallCodeGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156e2",
-                    "hash" : "0x0b907901070dc6fdbdbe8fa82068c5bfe1172f5c57027c039397c138b26228d3",
-                    "mixHash" : "0x5426a93039d7bc0ebe5a1a42a620a3c8d792c5e889b2d49dcac4182b8b6a45af",
-                    "nonce" : "0xe1d010321fb125a9",
+                    "hash" : "0xf4b20cf6afb6c971fa1d4279275c13c529b5a4fab3bc4f096c637fdfe5fc690f",
+                    "mixHash" : "0x31eb63ec5bed7cff06e68ff285cc2c708e3b5330fa196349a00814f9f5b61bd4",
+                    "nonce" : "0xa40eb66ed7d4cf84",
                     "number" : "0x01",
                     "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
                     "receiptTrie" : "0x9f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6cc",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a05426a93039d7bc0ebe5a1a42a620a3c8d792c5e889b2d49dcac4182b8b6a45af88e1d010321fb125a9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a031eb63ec5bed7cff06e68ff285cc2c708e3b5330fa196349a00814f9f5b61bd488a40eb66ed7d4cf84f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b907901070dc6fdbdbe8fa82068c5bfe1172f5c57027c039397c138b26228d3",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf4b20cf6afb6c971fa1d4279275c13c529b5a4fab3bc4f096c637fdfe5fc690f",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallCodeGasValueTransfer_d0g0v0_Metropolis" : {
+    "RawCallCodeGasValueTransfer_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015976",
-                    "hash" : "0x24b5d792e4d6087cbb4541af8e8642630c07d728d5204250d2601c1b1c68650d",
-                    "mixHash" : "0x8e479fe947b0e11634ccd811e3eff2dc58789299f2e7562cf13dac6410e45e1f",
-                    "nonce" : "0x2e86533e436566f6",
+                    "gasUsed" : "0x0156e2",
+                    "hash" : "0xf4ac7b06fd8bea35a0594bc2eaa299596906c3310da57ab43fa3b3fc587900f7",
+                    "mixHash" : "0xda4201eb75ca7ef3f653ed6ed917fdc0aef2a815f8c172ea18c98a0161e4ad52",
+                    "nonce" : "0x26c64648fc759c4c",
                     "number" : "0x01",
                     "parentHash" : "0xe294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933",
-                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
-                    "stateRoot" : "0x9f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56",
+                    "receiptTrie" : "0x9f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6cc",
+                    "stateRoot" : "0x1a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f2b5e472de608254890ce00d9b0f9ffd93fd309540b914e413541e3ab447d56a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a08e479fe947b0e11634ccd811e3eff2dc58789299f2e7562cf13dac6410e45e1f882e86533e436566f6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0e294fe38c5597c491d2b3c2a36fa3a9cf5171cafeaa1cf9e3e3474693fbde933a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a7737353d98be0c323038b576c1344c0e47fe7f0e8f743586677e9d609f6983a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a09f151a8f6061678b8a2ada71bd03f0f31cfd90f3dd3bf7eb182221abced4b6ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a0da4201eb75ca7ef3f653ed6ed917fdc0aef2a815f8c172ea18c98a0161e4ad528826c64648fc759c4cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7118a2d2a84a6d9435eb2ba879c606848a3316276676a73a3078f336188363a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24b5d792e4d6087cbb4541af8e8642630c07d728d5204250d2601c1b1c68650d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf4ac7b06fd8bea35a0594bc2eaa299596906c3310da57ab43fa3b3fc587900f7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -568,14 +697,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55976",
+                "balance" : "0x4563918244f556e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b680",
+                "balance" : "0xe8d4a3b914",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -587,7 +716,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x0695cd",
+                    "0x01" : "0x069861",
                     "0x02" : "0x7e2a"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0.json
index d800dc7ae..3e8c0f183 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallCodeGas_d0g0v0_EIP150" : {
+    "RawCallCodeGas_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/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xe5cb4aca1d27281f5a738db28fbc176e3467c1d37f16938cda27758760297ca7",
-                    "mixHash" : "0x4c9e3c31d8835448c86a270c995664066e98bcc01d949d9f16ae1c7e291a8ef1",
-                    "nonce" : "0x2713f8c1c4c51715",
+                    "hash" : "0xfa2abc66f9cac21c355f443796709fa341cadace3d48205617f296973bf7de08",
+                    "mixHash" : "0x51cdfdfface516e32d60b1bbabce8e0587ac8f18e470dee00fb66b17d2bef02c",
+                    "nonce" : "0xa5864fcc095b755a",
                     "number" : "0x01",
                     "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
-                    "receiptTrie" : "0x3062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000c",
-                    "stateRoot" : "0xefb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xb720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a04c9e3c31d8835448c86a270c995664066e98bcc01d949d9f16ae1c7e291a8ef1882713f8c1c4c51715f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a051cdfdfface516e32d60b1bbabce8e0587ac8f18e470dee00fb66b17d2bef02c88a5864fcc095b755af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5cb4aca1d27281f5a738db28fbc176e3467c1d37f16938cda27758760297ca7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfa2abc66f9cac21c355f443796709fa341cadace3d48205617f296973bf7de08",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallCodeGas_d0g0v0_EIP158" : {
+    "RawCallCodeGas_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/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xc9fe35cc11b532968d6030c079901aa0b3eecfab79c5005aa8a2d8ef956fdea9",
-                    "mixHash" : "0x58461d306261e4d20428df9bd55c8921a2e2881e4df66db2df9e476a0cb4214e",
-                    "nonce" : "0x16e0d51d338707d6",
+                    "hash" : "0xdae437b4bd0713e345dbd4a14e9f22172ec7b8c9b5e15ba3e4b8386e100518a1",
+                    "mixHash" : "0xc1c55c07889f2b4702e4fb4c8f3365244b2cb2c6ce768a6fec19f7005d5bc3a4",
+                    "nonce" : "0xb0e3da5c3500b702",
+                    "number" : "0x01",
+                    "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xb720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0c1c55c07889f2b4702e4fb4c8f3365244b2cb2c6ce768a6fec19f7005d5bc3a488b0e3da5c3500b702f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdae437b4bd0713e345dbd4a14e9f22172ec7b8c9b5e15ba3e4b8386e100518a1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9",
+                    "0x02" : "0x752e"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallCodeGas_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x23384221eb6d62b7cadf414e3447bdb4b3c9b068621557088e5688fdf7b19474",
+                    "mixHash" : "0x4740819ed7c0ee7d1c5e56018aab8c6f1bc49ac27e83e77b47ca7cf732479d13",
+                    "nonce" : "0x6869d07ac8b3b019",
                     "number" : "0x01",
                     "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
                     "receiptTrie" : "0x3062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000c",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a058461d306261e4d20428df9bd55c8921a2e2881e4df66db2df9e476a0cb4214e8816e0d51d338707d6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a04740819ed7c0ee7d1c5e56018aab8c6f1bc49ac27e83e77b47ca7cf732479d13886869d07ac8b3b019f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9fe35cc11b532968d6030c079901aa0b3eecfab79c5005aa8a2d8ef956fdea9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x23384221eb6d62b7cadf414e3447bdb4b3c9b068621557088e5688fdf7b19474",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallCodeGas_d0g0v0_Frontier" : {
+    "RawCallCodeGas_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/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013cb6",
-                    "hash" : "0xc4d8f50a592c0f35208cf6dae7c819118686bdfb9c1e0a47535d2b1e6601e18b",
-                    "mixHash" : "0x99c4f70f4db746aa421cce700ab262db1b45f062d21b575c4b4a6f9099b4e2da",
-                    "nonce" : "0x43a83fca522a9c14",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x64fc7164358c1d26897c6b728dced19015926357802f67f83e3cca11a5ed92bb",
+                    "mixHash" : "0x911754466e09d6e220919affbff554d5b823625038dad6ebe3aff2fd240800eb",
+                    "nonce" : "0x376b969173c89795",
                     "number" : "0x01",
                     "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
-                    "receiptTrie" : "0x8e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5",
-                    "stateRoot" : "0xe9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807",
+                    "receiptTrie" : "0x3062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000c",
+                    "stateRoot" : "0xefb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a099c4f70f4db746aa421cce700ab262db1b45f062d21b575c4b4a6f9099b4e2da8843a83fca522a9c14f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efb35b2f3f58b3844faa14f0b26dd4ffabe3a558d4d1a0a2617e8c0ea1e0fa14a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da03062a4a318d25b9f69eb3eccb00e7dfae165881b16c72446244cf4cc4186000cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0911754466e09d6e220919affbff554d5b823625038dad6ebe3aff2fd240800eb88376b969173c89795f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4d8f50a592c0f35208cf6dae7c819118686bdfb9c1e0a47535d2b1e6601e18b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x64fc7164358c1d26897c6b728dced19015926357802f67f83e3cca11a5ed92bb",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53cb6",
+                "balance" : "0x4563918244f53f4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d34a",
+                "balance" : "0xe8d4a3d0b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -336,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06b28d",
+                    "0x01" : "0x06aff9",
                     "0x02" : "0x752e"
                 }
             }
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallCodeGas_d0g0v0_Homestead" : {
+    "RawCallCodeGas_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/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013cb6",
-                    "hash" : "0x9933e70c689e5715725ecfdae40289ef9b6f2d4a1d8c22d5c1e0ed664676b646",
-                    "mixHash" : "0x819cbe51a628402c697f04c5fc3ed06981bf5ebc4882ca9df1632365cb6acff0",
-                    "nonce" : "0x5045d35f6470988c",
+                    "hash" : "0xcc26d533ed9ecb575447972bb851f8df4f9a06a13a89d09d7107d0d657944354",
+                    "mixHash" : "0xc155d58f2157ce7dec982f366e7fb508caf6713b121c7be4f22656cd891360d9",
+                    "nonce" : "0xe22eeb289f31b5fc",
                     "number" : "0x01",
                     "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
                     "receiptTrie" : "0x8e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a0819cbe51a628402c697f04c5fc3ed06981bf5ebc4882ca9df1632365cb6acff0885045d35f6470988cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a0c155d58f2157ce7dec982f366e7fb508caf6713b121c7be4f22656cd891360d988e22eeb289f31b5fcf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9933e70c689e5715725ecfdae40289ef9b6f2d4a1d8c22d5c1e0ed664676b646",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcc26d533ed9ecb575447972bb851f8df4f9a06a13a89d09d7107d0d657944354",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallCodeGas_d0g0v0_Metropolis" : {
+    "RawCallCodeGas_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallCodeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f4a",
-                    "hash" : "0x7082b14b113c8dd69842772a04bee7db7db80bcf4bb0b3aa46634de3bf451fba",
-                    "mixHash" : "0x335853685c43e1b1731129839be6df50787620bdb745305fc31e6646cdd6bf24",
-                    "nonce" : "0x1b0055bb4b8ec922",
+                    "gasUsed" : "0x013cb6",
+                    "hash" : "0x61586e6774cf9a96bd64ba9005ef7748eb19b2227f60f4bffc12db9ddf37db7d",
+                    "mixHash" : "0x9ba3099d8f7656e4768ed1700e127e7618e520947772dbcc22e935b8f2d651e9",
+                    "nonce" : "0x80d337de6aa70f8b",
                     "number" : "0x01",
                     "parentHash" : "0x0e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130add",
-                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
-                    "stateRoot" : "0xb720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2",
+                    "receiptTrie" : "0x8e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5",
+                    "stateRoot" : "0xe9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b720a9dd992cf0f9c09cd4d4afc24a0be4029dc7e28a7f42a8e992a514920ac2a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0335853685c43e1b1731129839be6df50787620bdb745305fc31e6646cdd6bf24881b0055bb4b8ec922f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a00e3c1c510a2a601945f30dc63704883022df8e7e047fa6eea860d91a0d130adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9ede0944fd592712ef95e7491ba5ca59f4210f70f17fa97b9b54fc9242ae807a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08e6cfe5bc92b17f96a1f3748e1325d8fd5696208961471a05bd88e6d651382c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a09ba3099d8f7656e4768ed1700e127e7618e520947772dbcc22e935b8f2d651e98880d337de6aa70f8bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02351c62038c02142fdc332dd9e1914158ede1d9b3a878c0aaf9448a917f808d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7082b14b113c8dd69842772a04bee7db7db80bcf4bb0b3aa46634de3bf451fba",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x61586e6774cf9a96bd64ba9005ef7748eb19b2227f60f4bffc12db9ddf37db7d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -568,14 +697,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f4a",
+                "balance" : "0x4563918244f53cb6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b6",
+                "balance" : "0xe8d4a3d34a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -587,7 +716,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06aff9",
+                    "0x01" : "0x06b28d",
                     "0x02" : "0x752e"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0.json
index cee121cc8..1fe360e4e 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGasAsk_d0g0v0_EIP150" : {
+    "RawCallGasAsk_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/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0x7055d226e8cc2a9c42e294ca0879d12569c7b5f57bdb37d0e9e3eef28b5007d6",
-                    "mixHash" : "0xc373638ba3964c4785017434250126a4476856d466e3859d2b24cba690d42b77",
-                    "nonce" : "0x8a068e1129320404",
+                    "hash" : "0xe7fdd26e2e1b7a64ee89f514906cb1513a6cff0f97d092a616afde1baffc9c83",
+                    "mixHash" : "0x531f55abe3b39b8fc2299eed20eb1a320b1484a80b21d6b37c7d669658853a35",
+                    "nonce" : "0xd4de1ef68e115394",
                     "number" : "0x01",
                     "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
-                    "receiptTrie" : "0x54160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bc",
-                    "stateRoot" : "0xf5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0x9cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da054160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0c373638ba3964c4785017434250126a4476856d466e3859d2b24cba690d42b77888a068e1129320404f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0531f55abe3b39b8fc2299eed20eb1a320b1484a80b21d6b37c7d669658853a3588d4de1ef68e115394f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7055d226e8cc2a9c42e294ca0879d12569c7b5f57bdb37d0e9e3eef28b5007d6",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe7fdd26e2e1b7a64ee89f514906cb1513a6cff0f97d092a616afde1baffc9c83",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGasAsk_d0g0v0_EIP158" : {
+    "RawCallGasAsk_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/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xad8ea00332415df3e160b82b52408861bc549e4e9d01bc1086c495ea3da994b8",
-                    "mixHash" : "0x0ddf05feb277ce91bc3569b7ae812981626831861884756881627443d896f30b",
-                    "nonce" : "0xa6a8f8665078b876",
+                    "hash" : "0x5615b638c4c848e2f7246009c0b00c8b8534f56b426087ab73ec643e8f8db214",
+                    "mixHash" : "0xdb9ebd02f60f266ae53eb9017a244ed6ca720c9f6657eaeb85d1a03e93c37b91",
+                    "nonce" : "0x881e0180743c99c6",
+                    "number" : "0x01",
+                    "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0x9cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0db9ebd02f60f266ae53eb9017a244ed6ca720c9f6657eaeb85d1a03e93c37b9188881e0180743c99c6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x77fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5615b638c4c848e2f7246009c0b00c8b8534f56b426087ab73ec643e8f8db214",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x06e228"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGasAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0xf6331297943af36d63d22b6fcd459892d5d5167d2183954bd6cfe3c049fcf381",
+                    "mixHash" : "0x81dcdab1a946a56c135d637cc0c40529a1ddf05e56f8d5da36bc4ebf48e9ba82",
+                    "nonce" : "0xa47680a00c6f248f",
                     "number" : "0x01",
                     "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
                     "receiptTrie" : "0x54160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bc",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da054160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a00ddf05feb277ce91bc3569b7ae812981626831861884756881627443d896f30b88a6a8f8665078b876f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da054160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a081dcdab1a946a56c135d637cc0c40529a1ddf05e56f8d5da36bc4ebf48e9ba8288a47680a00c6f248ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad8ea00332415df3e160b82b52408861bc549e4e9d01bc1086c495ea3da994b8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf6331297943af36d63d22b6fcd459892d5d5167d2183954bd6cfe3c049fcf381",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGasAsk_d0g0v0_Frontier" : {
+    "RawCallGasAsk_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/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xd56f837e3b282885c1afc0f949228e9c055c1d6df3b0d5f7a72010106a3fa3dc",
-                    "mixHash" : "0xd7c33b95fa0e32f7b9bca3eb1d478adddc4aa1302b0da45279a78c0ef957f0c4",
-                    "nonce" : "0x459f075690ee9e00",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0xc4e3bd75dd381bfc97fd8f3002642c9a71f789fff9945d9a515ca1c311d2996e",
+                    "mixHash" : "0x125e38028c6249d2aaa3860ebfe7fb1f619fdd5bfda3f3e9526fe3afc0201883",
+                    "nonce" : "0x9438bb5d20878283",
                     "number" : "0x01",
                     "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
-                    "receiptTrie" : "0x14c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504",
-                    "stateRoot" : "0xe1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553a",
+                    "receiptTrie" : "0x54160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bc",
+                    "stateRoot" : "0xf5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da014c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0d7c33b95fa0e32f7b9bca3eb1d478adddc4aa1302b0da45279a78c0ef957f0c488459f075690ee9e00f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c4dcb0ad4d44eec9b4331d8b3735e5ca37181c19fca29e7a665261b9956582a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da054160a0fbcc96a562b4cb8a11848a39e1f1d1d0839a614917831271fd684e1bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0125e38028c6249d2aaa3860ebfe7fb1f619fdd5bfda3f3e9526fe3afc0201883889438bb5d20878283f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,25 +442,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd56f837e3b282885c1afc0f949228e9c055c1d6df3b0d5f7a72010106a3fa3dc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc4e3bd75dd381bfc97fd8f3002642c9a71f789fff9945d9a515ca1c311d2996e",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x06e228"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f53f4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3d0b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +472,8 @@
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallGasAsk_d0g0v0_Homestead" : {
+    "RawCallGasAsk_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/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0x308c54b18b22bdb297b174dec44d58682048974189ae153a431beaee2f9810e5",
-                    "mixHash" : "0xfecf4b67504a0e9005e42eaef7a4f7dbb283c696267725010873badba8cf8d12",
-                    "nonce" : "0x2d2b52f43410bcb7",
+                    "hash" : "0x392a7b40869712c89a93dc17038f7e1968012312e8a59afc99e4960834313949",
+                    "mixHash" : "0xaf0cff1c169de6497765c9d075def28dbde967820c8483f7fafde8d56d9a4b1a",
+                    "nonce" : "0xb007949dd07ca062",
                     "number" : "0x01",
                     "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
                     "receiptTrie" : "0x14c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da014c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0fecf4b67504a0e9005e42eaef7a4f7dbb283c696267725010873badba8cf8d12882d2b52f43410bcb7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da014c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0af0cff1c169de6497765c9d075def28dbde967820c8483f7fafde8d56d9a4b1a88b007949dd07ca062f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x308c54b18b22bdb297b174dec44d58682048974189ae153a431beaee2f9810e5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x392a7b40869712c89a93dc17038f7e1968012312e8a59afc99e4960834313949",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallGasAsk_d0g0v0_Metropolis" : {
+    "RawCallGasAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f4a",
-                    "hash" : "0xae2fe0d5dfbe296c9b2c83b5739c2680fe7b0e3f2f4b3c52431892b1b795463f",
-                    "mixHash" : "0xc512fd604df8e5e71d79d69a4d5e2afb8c7451bc2f7aa88bdbb10e3acb39e084",
-                    "nonce" : "0x0eb8ae0828b3668e",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x2aec172ac7b7a5b4a37751278c67d62da30d945e045333bd121082edca1cba9e",
+                    "mixHash" : "0x73b3c5c1163349c856cf3f6cd8059f62c643499d3eca134f28bbaf6177b219bc",
+                    "nonce" : "0xfe585aec732cdcb8",
                     "number" : "0x01",
                     "parentHash" : "0xcf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9",
-                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
-                    "stateRoot" : "0x9cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367",
+                    "receiptTrie" : "0x14c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504",
+                    "stateRoot" : "0xe1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cda1109220aeac184aae1a74b5147fbfc0f25374f925cabe5395b7d61a45367a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0c512fd604df8e5e71d79d69a4d5e2afb8c7451bc2f7aa88bdbb10e3acb39e084880eb8ae0828b3668ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0cf5244032529aac76281ac7211f640f6ccb5a694bcf1fd5c8e6f5b1e7c29a3f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1dc568a351adce2da52abde20efc25078db2a2aa22606626c8fb6bea66a553aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da014c1bf9f9c6707356bbbddf2989dd1018ae3fea64fa291ffdeb87c34bda31504b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a073b3c5c1163349c856cf3f6cd8059f62c643499d3eca134f28bbaf6177b219bc88fe585aec732cdcb8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,33 +683,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077fd65ba8b0ed3e0b761ed670dd90fe2df5cf01e7b68d7e5245e8c22cb694b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae2fe0d5dfbe296c9b2c83b5739c2680fe7b0e3f2f4b3c52431892b1b795463f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2aec172ac7b7a5b4a37751278c67d62da30d945e045333bd121082edca1cba9e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x06e228"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f4a",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b6",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,8 +712,6 @@
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06aff9"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0.json
index d38381be8..ea9da0d84 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGasValueTransferAsk_d0g0v0_EIP150" : {
+    "RawCallGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0xaf34a674214f69346f97a1b6c454bdc73d583bbb29b78a121682783a06f69561",
-                    "mixHash" : "0x36c3878908b831dc5583bbb86e90a25be8b1cd5bec6c0849a4beb8c4d8e409f2",
-                    "nonce" : "0x6c255c64c280beb8",
+                    "hash" : "0xa11f9ce7b8027de83823c884286dd047cdae9ba6d2bcd26850f8b8f104a78074",
+                    "mixHash" : "0xd397aeb3a18c18c90c4224a4b9fbecf4e42e8046cb1de74a5bdfc43321c9fb03",
+                    "nonce" : "0x477300f7773fc5f5",
                     "number" : "0x01",
                     "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
-                    "receiptTrie" : "0x82d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9f",
-                    "stateRoot" : "0x7f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x56f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a082d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a036c3878908b831dc5583bbb86e90a25be8b1cd5bec6c0849a4beb8c4d8e409f2886c255c64c280beb8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0d397aeb3a18c18c90c4224a4b9fbecf4e42e8046cb1de74a5bdfc43321c9fb0388477300f7773fc5f5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf34a674214f69346f97a1b6c454bdc73d583bbb29b78a121682783a06f69561",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa11f9ce7b8027de83823c884286dd047cdae9ba6d2bcd26850f8b8f104a78074",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGasValueTransferAsk_d0g0v0_EIP158" : {
+    "RawCallGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0x776a5ea9cb86f46c60620dc85de68175815d79139efb9b884b4b992ba5f98839",
-                    "mixHash" : "0xe19e1b4ce7fcce8560342fa2fadc56a273d88a9163fc62f71835b8f2d5e4c273",
-                    "nonce" : "0x50d1ea406cf97de4",
+                    "hash" : "0x6dbc20037642f0ce2d3e7dce734848bf2c49f1511a8e78360bcf08520c9614c0",
+                    "mixHash" : "0xdfc5e3858e7eb72c879f7c4066ff9bd7fa86fdc251b8d2b7f088bc7c76e66a8b",
+                    "nonce" : "0x7dfd7ab1b483b3de",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x56f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0dfc5e3858e7eb72c879f7c4066ff9bd7fa86fdc251b8d2b7f088bc7c76e66a8b887dfd7ab1b483b3def862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6dbc20037642f0ce2d3e7dce734848bf2c49f1511a8e78360bcf08520c9614c0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x06c889"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b680",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGasValueTransferAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0x5505e2f07607e39de2151da15002629cd1aa289eec7c733b85448c7811e4bc7b",
+                    "mixHash" : "0xfcd771367afaeb22123f2533a285e2365e0385d21b7bfe1c608fea6f1817b451",
+                    "nonce" : "0x5abbe21dc46cc565",
                     "number" : "0x01",
                     "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
                     "receiptTrie" : "0x82d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9f",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a082d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0e19e1b4ce7fcce8560342fa2fadc56a273d88a9163fc62f71835b8f2d5e4c2738850d1ea406cf97de4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a082d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0fcd771367afaeb22123f2533a285e2365e0385d21b7bfe1c608fea6f1817b451885abbe21dc46cc565f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x776a5ea9cb86f46c60620dc85de68175815d79139efb9b884b4b992ba5f98839",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5505e2f07607e39de2151da15002629cd1aa289eec7c733b85448c7811e4bc7b",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGasValueTransferAsk_d0g0v0_Frontier" : {
+    "RawCallGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xd65ca285f3fc4d5d5aeb45550630acbd03d93954c6172172011b973fdb258f51",
-                    "mixHash" : "0x36feb762f82dd6c2eac27ceb7203ba0fb99fdf706cce9792ec1bd2c7ca27cbe9",
-                    "nonce" : "0xf93e30959b628f64",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0xd85f526e93efb092c0d2781488c71dd041be91937e5c63a71dbd1ef65fe4a7e2",
+                    "mixHash" : "0x6f0464154afb56b6321f7a8335efc860ddc3567379ffc7a4c43ec8b919ca7980",
+                    "nonce" : "0x7bf828067bb9c2a5",
                     "number" : "0x01",
                     "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
-                    "receiptTrie" : "0x28b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7a",
-                    "stateRoot" : "0x66d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926f",
+                    "receiptTrie" : "0x82d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9f",
+                    "stateRoot" : "0x7f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a028b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a036feb762f82dd6c2eac27ceb7203ba0fb99fdf706cce9792ec1bd2c7ca27cbe988f93e30959b628f64f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f7fcfaab32c0481b86ba78e46027566c31e29f1023597ca39481deecf3be971a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a082d0a8c80f4af0faf94cf8a35f67ee1d380e0f56fccef33c4b41afbabb279f9fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a06f0464154afb56b6321f7a8335efc860ddc3567379ffc7a4c43ec8b919ca7980887bf828067bb9c2a5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,25 +442,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd65ca285f3fc4d5d5aeb45550630acbd03d93954c6172172011b973fdb258f51",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd85f526e93efb092c0d2781488c71dd041be91937e5c63a71dbd1ef65fe4a7e2",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x06c889"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f55976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3b680",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +472,8 @@
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallGasValueTransferAsk_d0g0v0_Homestead" : {
+    "RawCallGasValueTransferAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xc81eedebfae59dff399f7cf305c2cf0d51b70ae5469ad8fbd615163b59a0e814",
-                    "mixHash" : "0xc0c75e4fdce20b27bc423b82947bfe6f0d911aee4d3c2bf311649347d211a60c",
-                    "nonce" : "0x808b6bff93d40048",
+                    "hash" : "0xf7ee367a2ff21a135ef573ebfddd68817f2fe5ac25ae043321fe7b077395ed7d",
+                    "mixHash" : "0xdbb196ff93d13d3e58af0fdc94a802149739101697a65f954f11f01179bcc93a",
+                    "nonce" : "0xee84c08a4eb18c3e",
                     "number" : "0x01",
                     "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
                     "receiptTrie" : "0x28b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7a",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a028b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0c0c75e4fdce20b27bc423b82947bfe6f0d911aee4d3c2bf311649347d211a60c88808b6bff93d40048f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a028b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0dbb196ff93d13d3e58af0fdc94a802149739101697a65f954f11f01179bcc93a88ee84c08a4eb18c3ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc81eedebfae59dff399f7cf305c2cf0d51b70ae5469ad8fbd615163b59a0e814",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf7ee367a2ff21a135ef573ebfddd68817f2fe5ac25ae043321fe7b077395ed7d",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallGasValueTransferAsk_d0g0v0_Metropolis" : {
+    "RawCallGasValueTransferAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015976",
-                    "hash" : "0xf404b935fc296787373c53ce5798e5985be0aac82456f980ebda47056d398dfd",
-                    "mixHash" : "0xdb3c9f1d3cae1a7a933987f2a07212ecbc32815531062892ab932949a4fdc8fd",
-                    "nonce" : "0x1066748665028e48",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x8dfa549be8bc81a7150c353ca2571b25a74238c287c5d471c1f9625bb5c06d2e",
+                    "mixHash" : "0x5433c2a2e7c842e736781a35914f4d4e7e516789671be28d65bd299f73b18b9c",
+                    "nonce" : "0xb031fc7529955792",
                     "number" : "0x01",
                     "parentHash" : "0xcfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961a",
-                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
-                    "stateRoot" : "0x56f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4",
+                    "receiptTrie" : "0x28b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7a",
+                    "stateRoot" : "0x66d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056f2036a5e513098792eaad3eee0ddf6ac5f13ce8528e251706500957c7864e4a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0db3c9f1d3cae1a7a933987f2a07212ecbc32815531062892ab932949a4fdc8fd881066748665028e48f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0cfd23f3580eb5496dc1dc3f924fd4ada050cc8f28af753be9af118d55960961aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066d2fe73b2a7b92c253edf924270e4ae58bb1e9c9725c712bcf1ae4fc94f926fa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a028b25db34ccfdbfbb2b53b0ebc087ce9cc81aec7e038c05861a10e16aa3d6d7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a05433c2a2e7c842e736781a35914f4d4e7e516789671be28d65bd299f73b18b9c88b031fc7529955792f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,33 +683,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eac82e5411092958d32fe3904a4eb024cd1e9237477cff3caff42a397ff1251aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf404b935fc296787373c53ce5798e5985be0aac82456f980ebda47056d398dfd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8dfa549be8bc81a7150c353ca2571b25a74238c287c5d471c1f9625bb5c06d2e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x06c889"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55976",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b680",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,8 +712,6 @@
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x0695cd"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0.json
index ffb09cb09..6f88eaabe 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGasValueTransferMemoryAsk_d0g0v0_EIP150" : {
+    "RawCallGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xd999ed9b1f02570bba7c7f5eda76c901d3a4d514abf90312da088d265022153e",
-                    "mixHash" : "0x5482802bab449a708a07e635c3809c970bc67c61dd16a3bdf54e690755b1ad83",
-                    "nonce" : "0x52dddcbc8d1616e6",
+                    "hash" : "0xf42907a8950b935c95795b9914fcf128fc077712195bcdbde6e6865c121f0843",
+                    "mixHash" : "0x65ef7dd25731e9c6eea17233fd717af7e72286eb7510b4735a67d706c1ee0f3b",
+                    "nonce" : "0x5a0e7a698f5fa623",
                     "number" : "0x01",
                     "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
-                    "receiptTrie" : "0x0e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731",
-                    "stateRoot" : "0x40115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdae",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0x6bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdaea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a05482802bab449a708a07e635c3809c970bc67c61dd16a3bdf54e690755b1ad838852dddcbc8d1616e6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a065ef7dd25731e9c6eea17233fd717af7e72286eb7510b4735a67d706c1ee0f3b885a0e7a698f5fa623f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd999ed9b1f02570bba7c7f5eda76c901d3a4d514abf90312da088d265022153e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf42907a8950b935c95795b9914fcf128fc077712195bcdbde6e6865c121f0843",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemoryAsk_d0g0v0_EIP158" : {
+    "RawCallGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xd2a0394e69f14b7a4f7261eb1616ccfd7baf3e60398f1b0a7661c79db4a880a7",
-                    "mixHash" : "0xf511aa473c0733e005a245b74a2b18fd277dad3268a996f2db6e7a1b6e7977ef",
-                    "nonce" : "0x865773eed71c4ce9",
+                    "hash" : "0x6bbd6245a3c1d148df37d265dbb35cb3c7cb591375e3f8670f967b11cf5fd1d8",
+                    "mixHash" : "0xb2bad12e037c41e525270440c2fce341759df8843c579d7d32250c16e09b450c",
+                    "nonce" : "0x4a2454fe808a77a3",
+                    "number" : "0x01",
+                    "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0x6bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0b2bad12e037c41e525270440c2fce341759df8843c579d7d32250c16e09b450c884a2454fe808a77a3f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x62a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6bbd6245a3c1d148df37d265dbb35cb3c7cb591375e3f8670f967b11cf5fd1d8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x06c52e"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55cde",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b318",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGasValueTransferMemoryAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0xc3d34c54e74f781c54517c0d728ba4a7af860fb6151147f938fafe1fdbda2fc5",
+                    "mixHash" : "0xafdd3fd6c9ca5389b67a33ff7cf15ce413a2b6aeca651c2d3a073bb5ce9bad00",
+                    "nonce" : "0xeb062183cadab639",
                     "number" : "0x01",
                     "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
                     "receiptTrie" : "0x0e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdaea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0f511aa473c0733e005a245b74a2b18fd277dad3268a996f2db6e7a1b6e7977ef88865773eed71c4ce9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdaea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0afdd3fd6c9ca5389b67a33ff7cf15ce413a2b6aeca651c2d3a073bb5ce9bad0088eb062183cadab639f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2a0394e69f14b7a4f7261eb1616ccfd7baf3e60398f1b0a7661c79db4a880a7",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc3d34c54e74f781c54517c0d728ba4a7af860fb6151147f938fafe1fdbda2fc5",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemoryAsk_d0g0v0_Frontier" : {
+    "RawCallGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xd249cd9c0421b55e80e78dabf2b797ebf7fde430c2395f6c809b38e300ef803d",
-                    "mixHash" : "0xd3525e2c83e49a44992f768ebb0e7055da937fbb7973a125dc28acf1b3aeb8be",
-                    "nonce" : "0x557fcc35af0aa245",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0xd262d12e224249fee0b7126f2765d27e492800bf793114cb8668b742f7a1221f",
+                    "mixHash" : "0x12f1cfc9f83c4ce034a1063b71fe3564b2cafa1cdcab6de60e3819ac99beeefc",
+                    "nonce" : "0x1cbc355162837f50",
                     "number" : "0x01",
                     "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
-                    "receiptTrie" : "0x7ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbd",
-                    "stateRoot" : "0x4331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3",
+                    "receiptTrie" : "0x0e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731",
+                    "stateRoot" : "0x40115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0d3525e2c83e49a44992f768ebb0e7055da937fbb7973a125dc28acf1b3aeb8be88557fcc35af0aa245f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040115c3489a37e6509d63b5c4a9f6661c5e5b25f06a07cea649879ab54d0fdaea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00e091555e792cd15cc21605d8f5c4d96437804d5a6c4d5435b5812abf5871731b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a012f1cfc9f83c4ce034a1063b71fe3564b2cafa1cdcab6de60e3819ac99beeefc881cbc355162837f50f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,25 +442,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd249cd9c0421b55e80e78dabf2b797ebf7fde430c2395f6c809b38e300ef803d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd262d12e224249fee0b7126f2765d27e492800bf793114cb8668b742f7a1221f",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x06c52e"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f55cde",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3b318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +472,8 @@
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemoryAsk_d0g0v0_Homestead" : {
+    "RawCallGasValueTransferMemoryAsk_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xc035a0ce76e8e392cc9be55a1f458f113e35b29d96594ea20003b2802fef9f58",
-                    "mixHash" : "0x9a496d2a6e6de788b3976785e14144cb815945002d5f79d963a987ebfe87e0ed",
-                    "nonce" : "0x83a3d7a834772e13",
+                    "hash" : "0x3fbab326f2d4e9f26b8eac726ceb1d0d1f6dab68afb8cd0b3ba560f65e1c8758",
+                    "mixHash" : "0xe37556cbde4c0f731ca23102b0b882b3931394f043f6422bc22b85a79f71d669",
+                    "nonce" : "0x873f7e2c83143904",
                     "number" : "0x01",
                     "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
                     "receiptTrie" : "0x7ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbd",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a09a496d2a6e6de788b3976785e14144cb815945002d5f79d963a987ebfe87e0ed8883a3d7a834772e13f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0e37556cbde4c0f731ca23102b0b882b3931394f043f6422bc22b85a79f71d66988873f7e2c83143904f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc035a0ce76e8e392cc9be55a1f458f113e35b29d96594ea20003b2802fef9f58",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3fbab326f2d4e9f26b8eac726ceb1d0d1f6dab68afb8cd0b3ba560f65e1c8758",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemoryAsk_d0g0v0_Metropolis" : {
+    "RawCallGasValueTransferMemoryAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015cde",
-                    "hash" : "0x59ee37debbe8938ed059e690ab158ee51f231468bedfdb159f54b34d88263630",
-                    "mixHash" : "0xeb5ad7b21f82ec9da230d4fbdebf3ba1cf72a52d4ad2661815a6e475fbb10c8e",
-                    "nonce" : "0x8f4366216dd2b56c",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x33093dcaf5f8bb25381ff3eecaf60d740567ef767361319f7ed9c1c48e1161b4",
+                    "mixHash" : "0xbdd38cc5abbb25084c36bfaf6faf1d272e61e99ef4b2555975497d859a1a5156",
+                    "nonce" : "0x2641f8ec9670e395",
                     "number" : "0x01",
                     "parentHash" : "0x16f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41",
-                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
-                    "stateRoot" : "0x6bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17",
+                    "receiptTrie" : "0x7ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbd",
+                    "stateRoot" : "0x4331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06bb6e62fae9bb2d1f5ee4fe5d28d47090d5b2ad0e006ae7ac5ae16b41f7d4c17a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0eb5ad7b21f82ec9da230d4fbdebf3ba1cf72a52d4ad2661815a6e475fbb10c8e888f4366216dd2b56cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a016f36af7f9985dd61b584f9f8414be6e14994d6bee92a04988578e509b7d6a41a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04331059849fc786aa62d69c4014c2eba70e819b9dac2df56c18ea2adc18552e3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a07ad6f50bf841655c797290cc2a1c15ec3813ff4e0d1f47af9a45942668f32dbdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0bdd38cc5abbb25084c36bfaf6faf1d272e61e99ef4b2555975497d859a1a5156882641f8ec9670e395f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,33 +683,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062a3291765da8022015aaf456e348723ad592e3ede2d5b36b1925dcfe55a36eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59ee37debbe8938ed059e690ab158ee51f231468bedfdb159f54b34d88263630",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x33093dcaf5f8bb25381ff3eecaf60d740567ef767361319f7ed9c1c48e1161b4",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x06c52e"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55cde",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b318",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,8 +712,6 @@
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x069265"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0.json
index b2ebef3a1..395d885a5 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGasValueTransferMemory_d0g0v0_EIP150" : {
+    "RawCallGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xf99b0cf00cd7beafa00c724c6a47e4a2a457d6db1babc71be248083384953d79",
-                    "mixHash" : "0xc2cf8dcae1a69076ab2ec122264c23605ec56317c2afc0b6de48040552659015",
-                    "nonce" : "0x35f20e01f749493a",
+                    "hash" : "0x2f4d65c9c131e60adc62bb7d8156761026dbdaa919e839be0fc068833a4b19c7",
+                    "mixHash" : "0xfacb9918742f70839545cdc0a3a330e3399e57e0ffacaad0cd2d1e9207436d98",
+                    "nonce" : "0x71416d013697bfca",
                     "number" : "0x01",
                     "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
-                    "receiptTrie" : "0xa67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8",
-                    "stateRoot" : "0x13408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xda43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87fee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa013408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0c2cf8dcae1a69076ab2ec122264c23605ec56317c2afc0b6de480405526590158835f20e01f749493af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87feea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0facb9918742f70839545cdc0a3a330e3399e57e0ffacaad0cd2d1e9207436d988871416d013697bfcaf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf99b0cf00cd7beafa00c724c6a47e4a2a457d6db1babc71be248083384953d79",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2f4d65c9c131e60adc62bb7d8156761026dbdaa919e839be0fc068833a4b19c7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemory_d0g0v0_EIP158" : {
+    "RawCallGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015cde",
-                    "hash" : "0xbe0a95424096efee5d79d57b69e53d66c85b942dee9f2a94bbcbe24f237125ca",
-                    "mixHash" : "0xd249eb3eca221c1e602089c137581b34d1a8e050bccff9cbc257de7300fd0700",
-                    "nonce" : "0x78505fc991d9543c",
+                    "hash" : "0x262cd3b62452f74a554f99ad509a1c7ebec92acdcb7901d10bd7b363a1e2342b",
+                    "mixHash" : "0xb19ca3de69d0cb17f1435e08824b3a1f834704969bc62f4621941925809d51b8",
+                    "nonce" : "0x1a1df5fb6bb329fd",
+                    "number" : "0x01",
+                    "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
+                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
+                    "stateRoot" : "0xda43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87fee",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87feea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0b19ca3de69d0cb17f1435e08824b3a1f834704969bc62f4621941925809d51b8881a1df5fb6bb329fdf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x262cd3b62452f74a554f99ad509a1c7ebec92acdcb7901d10bd7b363a1e2342b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x7e2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55cde",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b318",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x069265"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGasValueTransferMemory_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0xfa02ecbe45e34db16a4352f122b48338a9899e1360fe36f5505e9ba4100b50d0",
+                    "mixHash" : "0xf724f4d90eb28986fd6c3581425d2b4fddc1e2a557c757ca1461426e0c67563a",
+                    "nonce" : "0x3598a05ff39a2dd3",
                     "number" : "0x01",
                     "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
                     "receiptTrie" : "0xa67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa013408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0d249eb3eca221c1e602089c137581b34d1a8e050bccff9cbc257de7300fd07008878505fc991d9543cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa013408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0f724f4d90eb28986fd6c3581425d2b4fddc1e2a557c757ca1461426e0c67563a883598a05ff39a2dd3f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe0a95424096efee5d79d57b69e53d66c85b942dee9f2a94bbcbe24f237125ca",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfa02ecbe45e34db16a4352f122b48338a9899e1360fe36f5505e9ba4100b50d0",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemory_d0g0v0_Frontier" : {
+    "RawCallGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015a4a",
-                    "hash" : "0x4525e9ac459a831fc56e63e10b5f5946e6ee9d6b9e89de32aec8af83cc29e30b",
-                    "mixHash" : "0xd64cb12f9256e4a8aa6427b496cbd76dfdad01647b8cf4af3d3691037c894fed",
-                    "nonce" : "0x3e1289c5abd62007",
+                    "gasUsed" : "0x015cde",
+                    "hash" : "0x0a46ba3f6efa1d89fcfac80955a1a9b7dc181232996a798c93a605d9d113fe5b",
+                    "mixHash" : "0xcda30b4c23a4a2d1dd0912889e6b00cf2d03bc4458f46ff953a7fd4464e99848",
+                    "nonce" : "0x5c0db5e5263ca0b1",
                     "number" : "0x01",
                     "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
-                    "receiptTrie" : "0x4848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495",
-                    "stateRoot" : "0x0961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18",
+                    "receiptTrie" : "0xa67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8",
+                    "stateRoot" : "0x13408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a04848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a0d64cb12f9256e4a8aa6427b496cbd76dfdad01647b8cf4af3d3691037c894fed883e1289c5abd62007f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa013408af01d035bc2ad67bf58dcc3b224d3e8c848a723c749a87a7ea0550e9c38a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a67eee16f90b497fbbafbcb7c796f5f4ba72b6b257bad6fc911df9aee42cf1b8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a0cda30b4c23a4a2d1dd0912889e6b00cf2d03bc4458f46ff953a7fd4464e99848885c0db5e5263ca0b1f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4525e9ac459a831fc56e63e10b5f5946e6ee9d6b9e89de32aec8af83cc29e30b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0a46ba3f6efa1d89fcfac80955a1a9b7dc181232996a798c93a605d9d113fe5b",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -318,14 +454,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55a4a",
+                "balance" : "0x4563918244f55cde",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b5ac",
+                "balance" : "0xe8d4a3b318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,7 +473,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x0694f9"
+                    "0x01" : "0x069265"
                 }
             }
         },
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemory_d0g0v0_Homestead" : {
+    "RawCallGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015a4a",
-                    "hash" : "0x83c30ae724df179e0e98b0480be7fd0de9ec59dc7c785b159963bb4c42e64326",
-                    "mixHash" : "0x1ebac7f5e58177d6758464bb9fed83caed46bd0ddeec19f11761cbe2705bf62f",
-                    "nonce" : "0xeb126845afef283b",
+                    "hash" : "0x6768ba49a27b48ce44c1a0312d6a6c33752f27766a2c416f5b4bc05a197f30ba",
+                    "mixHash" : "0x7c5f6249d9bc728bf00d0ed5859cd19f8e9c1f821436e86ea56d43135493f148",
+                    "nonce" : "0x0d972bb44212e519",
                     "number" : "0x01",
                     "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
                     "receiptTrie" : "0x4848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a04848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a01ebac7f5e58177d6758464bb9fed83caed46bd0ddeec19f11761cbe2705bf62f88eb126845afef283bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a04848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a07c5f6249d9bc728bf00d0ed5859cd19f8e9c1f821436e86ea56d43135493f148880d972bb44212e519f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83c30ae724df179e0e98b0480be7fd0de9ec59dc7c785b159963bb4c42e64326",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6768ba49a27b48ce44c1a0312d6a6c33752f27766a2c416f5b4bc05a197f30ba",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallGasValueTransferMemory_d0g0v0_Metropolis" : {
+    "RawCallGasValueTransferMemory_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015cde",
-                    "hash" : "0x3f7c93e3d5550aac9397666e526d397072b09e6cc5289969b807f6ccb7ddb4f2",
-                    "mixHash" : "0x2f09bc85079560975f50b315433be9ad00bbd632b3de8e2de1f8390d9034f046",
-                    "nonce" : "0x73ca3645f7c149c5",
+                    "gasUsed" : "0x015a4a",
+                    "hash" : "0xd81bce1ee17c97196677e8dc09bab18432fea442a32ae2562f5b2323aa814e9a",
+                    "mixHash" : "0xdeff52cf47c41d7a9012f3cb5bf5f928202ce532a2e2c6ab4b37d438884b8d85",
+                    "nonce" : "0x3d9537512b4dd86e",
                     "number" : "0x01",
                     "parentHash" : "0x33efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801",
-                    "receiptTrie" : "0xb7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895d",
-                    "stateRoot" : "0xda43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87fee",
+                    "receiptTrie" : "0x4848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495",
+                    "stateRoot" : "0x0961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da43a68c9e6fe0b11b330f6c6f3a301dc6c318cfeb51b640af31ad20f1f87feea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0b7ba292fc0221acbaeb3941530fd019c247c318278a802e16cac7b20bb72895db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015cde8203e880a02f09bc85079560975f50b315433be9ad00bbd632b3de8e2de1f8390d9034f0468873ca3645f7c149c5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a033efe24d1ad15d25bb09519fe0287a3d32f1ba3ff370997ec412c71bfa24c801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00961e9873a3f62eb16a1d73840c193ded3ebc9b1be727456c4242fef4fd0dc18a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a04848fc5bd30075a2e3de6b700987c409dfbef23969fd0fcff0f1044b9b4d9495b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015a4a8203e880a0deff52cf47c41d7a9012f3cb5bf5f928202ce532a2e2c6ab4b37d438884b8d85883d9537512b4dd86ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09752ed2ab8450a581998c89f9432fb0cd35e8bdcfee1006990755e5a52ce3ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f7c93e3d5550aac9397666e526d397072b09e6cc5289969b807f6ccb7ddb4f2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd81bce1ee17c97196677e8dc09bab18432fea442a32ae2562f5b2323aa814e9a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -569,14 +698,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55cde",
+                "balance" : "0x4563918244f55a4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b318",
+                "balance" : "0xe8d4a3b5ac",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -588,7 +717,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x069265"
+                    "0x01" : "0x0694f9"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0.json
index 06f93187d..d5b6b29bd 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGasValueTransfer_d0g0v0_EIP150" : {
+    "RawCallGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0x386841570b7c86ee62ddb3e7d6f9aed3a63349f082e7d38d8f5c99565acf7bee",
-                    "mixHash" : "0x24cb45af1a0ef7946312d6a8e94b289734214185a1d8a257e5b4c0108187f96d",
-                    "nonce" : "0x515cda8336b9508a",
+                    "hash" : "0x5a13dfe8daba5ba8d077da190e649f888eebf88475b9b922abdccc6f5742f9ef",
+                    "mixHash" : "0xea189ea58bca32b69d275bb0333c065fc106ecd51d87bfbe2b1e2a2784bdbb56",
+                    "nonce" : "0x2be9fa7fed7d978b",
                     "number" : "0x01",
                     "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
-                    "receiptTrie" : "0x0d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bca",
-                    "stateRoot" : "0xa27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x4ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bcab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a024cb45af1a0ef7946312d6a8e94b289734214185a1d8a257e5b4c0108187f96d88515cda8336b9508af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0ea189ea58bca32b69d275bb0333c065fc106ecd51d87bfbe2b1e2a2784bdbb56882be9fa7fed7d978bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x386841570b7c86ee62ddb3e7d6f9aed3a63349f082e7d38d8f5c99565acf7bee",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5a13dfe8daba5ba8d077da190e649f888eebf88475b9b922abdccc6f5742f9ef",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGasValueTransfer_d0g0v0_EIP158" : {
+    "RawCallGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015976",
-                    "hash" : "0xe5d9d25c9e1e31012cd45a9c4e7b563265af6a5cf2a5683ccc018278aea21e36",
-                    "mixHash" : "0xf45210311dc77a30cb563a7e9a9d724a01e02b3dcdf194ca0007ee5f464d37aa",
-                    "nonce" : "0x814bcb8228ad5b63",
+                    "hash" : "0x33b8d93bb61a1cf09c83f20600283ada7971794a5009eaa4d10998f68a01369b",
+                    "mixHash" : "0x106b40ed6c309fd7dd7196910ace28e5c6c9db3d5d7b4ae389e5d9105dcd17ae",
+                    "nonce" : "0x47cc1cf2cd3b22f7",
+                    "number" : "0x01",
+                    "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
+                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
+                    "stateRoot" : "0x4ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0106b40ed6c309fd7dd7196910ace28e5c6c9db3d5d7b4ae389e5d9105dcd17ae8847cc1cf2cd3b22f7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x33b8d93bb61a1cf09c83f20600283ada7971794a5009eaa4d10998f68a01369b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x7e2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b680",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0695cd"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGasValueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0x182ff29b722f5fb2c4c1fad9cd0ce79e4cbdbcca0beaaa9094865135c126fe20",
+                    "mixHash" : "0xf0eefd54229f36b564c6f2ad327aa3069d8b3aee04ec738bf1f8f6cc5ff4c898",
+                    "nonce" : "0x1ce8a7c4808b2952",
                     "number" : "0x01",
                     "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
                     "receiptTrie" : "0x0d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bca",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bcab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0f45210311dc77a30cb563a7e9a9d724a01e02b3dcdf194ca0007ee5f464d37aa88814bcb8228ad5b63f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bcab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0f0eefd54229f36b564c6f2ad327aa3069d8b3aee04ec738bf1f8f6cc5ff4c898881ce8a7c4808b2952f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5d9d25c9e1e31012cd45a9c4e7b563265af6a5cf2a5683ccc018278aea21e36",
-        "network" : "EIP158",
+        "lastblockhash" : "0x182ff29b722f5fb2c4c1fad9cd0ce79e4cbdbcca0beaaa9094865135c126fe20",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGasValueTransfer_d0g0v0_Frontier" : {
+    "RawCallGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0156e2",
-                    "hash" : "0xa7ce02637f6e5ceca3304a1908c6d661e33a4b8128b2afbd9bf15318e467e3c7",
-                    "mixHash" : "0xfa4db69bdcff53a717b6882da3e4ba42608a5a3cfd876b104295369419960dd2",
-                    "nonce" : "0x7427d22d2fece8a5",
+                    "gasUsed" : "0x015976",
+                    "hash" : "0x9ca111e56e8bf75054b4157aa9e74148684dcb2eceb453d1b11c895eb26d08e5",
+                    "mixHash" : "0x24a4eac090e7c0a4770dc0cd74110dc7ee39708dd25e122fcf049aadd7b3dd5f",
+                    "nonce" : "0x86f2c3cdc338e2bb",
                     "number" : "0x01",
                     "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
-                    "receiptTrie" : "0xc92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23",
-                    "stateRoot" : "0x0e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18c",
+                    "receiptTrie" : "0x0d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bca",
+                    "stateRoot" : "0xa27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18ca01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0c92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a0fa4db69bdcff53a717b6882da3e4ba42608a5a3cfd876b104295369419960dd2887427d22d2fece8a5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27a9ec3a439616b027378b9671e70efcacb4999ee9fc2eb209c6d673bed5376a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a00d48fcc0a5d96cc2c9a2784b11812519c91680be1d1cc0838340e3e5d7f38bcab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a024a4eac090e7c0a4770dc0cd74110dc7ee39708dd25e122fcf049aadd7b3dd5f8886f2c3cdc338e2bbf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7ce02637f6e5ceca3304a1908c6d661e33a4b8128b2afbd9bf15318e467e3c7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9ca111e56e8bf75054b4157aa9e74148684dcb2eceb453d1b11c895eb26d08e5",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -318,14 +454,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f556e2",
+                "balance" : "0x4563918244f55976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b914",
+                "balance" : "0xe8d4a3b680",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,7 +473,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x069861"
+                    "0x01" : "0x0695cd"
                 }
             }
         },
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallGasValueTransfer_d0g0v0_Homestead" : {
+    "RawCallGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156e2",
-                    "hash" : "0x5070a49a40606671e8e494ec2e3e3eb687a78200e8d6af1475eaa9d4c4d52564",
-                    "mixHash" : "0xe3f17c93d334c68db8666bd41e03d9fc5f547cf951c4404b53191ff05edf1be1",
-                    "nonce" : "0x59792cbf44a920fa",
+                    "hash" : "0xcbfa523382daa5d86f9e8f0fb9ed2060fc2a873cbc6bb9b19fae32b5fc2588e3",
+                    "mixHash" : "0x07b5ffa9aaa58fd4246c34fd35b9879475ba93fa2f3e2004620244fdda15c7a7",
+                    "nonce" : "0xadad9a43e7f27a47",
                     "number" : "0x01",
                     "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
                     "receiptTrie" : "0xc92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18ca01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0c92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a0e3f17c93d334c68db8666bd41e03d9fc5f547cf951c4404b53191ff05edf1be18859792cbf44a920faf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18ca01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0c92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a007b5ffa9aaa58fd4246c34fd35b9879475ba93fa2f3e2004620244fdda15c7a788adad9a43e7f27a47f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5070a49a40606671e8e494ec2e3e3eb687a78200e8d6af1475eaa9d4c4d52564",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcbfa523382daa5d86f9e8f0fb9ed2060fc2a873cbc6bb9b19fae32b5fc2588e3",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallGasValueTransfer_d0g0v0_Metropolis" : {
+    "RawCallGasValueTransfer_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015976",
-                    "hash" : "0x4e722970b604fd1c3686f8b9c9d3be40ed7991fa89a281e7cb1d42020232dc22",
-                    "mixHash" : "0x175916314f4b6710c7c61ce9700d71277075eb32ec044885ad56d0b150fff0e1",
-                    "nonce" : "0x41454e7c20443fd6",
+                    "gasUsed" : "0x0156e2",
+                    "hash" : "0xe89c4795c74b7bff47abb0587056aa5de374c61f5c5931f8400653d389e7e439",
+                    "mixHash" : "0x2b7815d8ed59f36f37b0e630460ea0706d47bfface27a5d2dd710ebfdc3bfc04",
+                    "nonce" : "0xa6bbedff88b10f0e",
                     "number" : "0x01",
                     "parentHash" : "0x7277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51",
-                    "receiptTrie" : "0x84c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7",
-                    "stateRoot" : "0x4ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1",
+                    "receiptTrie" : "0xc92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23",
+                    "stateRoot" : "0x0e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ea91eb22bdf62ac3259d411ff72b0cbe0bf43c0f2931ca5b35ccf349fff17e1a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a084c3e8bbe2c4a65187ca201df5fafe44303d910bb0ebfa8a336c6c9f6e1681b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159768203e880a0175916314f4b6710c7c61ce9700d71277075eb32ec044885ad56d0b150fff0e18841454e7c20443fd6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a07277ba253b299e1ee24dc443c0c316aa2ace93fdf8dae3f8bd58c78cbf5abe51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e7cfbbcddff72154538f4a4a4bc584bd2b5cda9bc931954630649d1c439f18ca01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0c92f4430934910caefa4aeef998cb2d7f189dd727c490f613e009f1568f69a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156e28203e880a02b7815d8ed59f36f37b0e630460ea0706d47bfface27a5d2dd710ebfdc3bfc0488a6bbedff88b10f0ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f50fa212a0813e4db445f73f12afb089429b170522e595d9a017f45ba3a9ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e722970b604fd1c3686f8b9c9d3be40ed7991fa89a281e7cb1d42020232dc22",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe89c4795c74b7bff47abb0587056aa5de374c61f5c5931f8400653d389e7e439",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x5a600255",
@@ -569,14 +698,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55976",
+                "balance" : "0x4563918244f556e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b680",
+                "balance" : "0xe8d4a3b914",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -588,7 +717,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x0695cd"
+                    "0x01" : "0x069861"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0.json
index 7cc8064b2..27e189e01 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallGas_d0g0v0_EIP150" : {
+    "RawCallGas_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/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xe0f7f45a119de2288c10c793437896cc9f66d5bc4ea5892bb1a954e011b24a2d",
-                    "mixHash" : "0xaf50da08b7042387b54516d66fa20b8706e371b5cc1fe8f53a7d74f165f66156",
-                    "nonce" : "0x22d32a42e3173039",
+                    "hash" : "0x48f1a9889c8ae29c22936aa9c671cc04817b71dd22848c371cbde3e8deec51cc",
+                    "mixHash" : "0x2b3074b6eedf7ee4df75ace6b1417a1777fb1ac83c390572a890c43c5352f57f",
+                    "nonce" : "0xc07f290434b4b87d",
                     "number" : "0x01",
                     "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
-                    "receiptTrie" : "0x4448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90",
-                    "stateRoot" : "0x9f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfb",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xfa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da04448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0af50da08b7042387b54516d66fa20b8706e371b5cc1fe8f53a7d74f165f661568822d32a42e3173039f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aeca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a02b3074b6eedf7ee4df75ace6b1417a1777fb1ac83c390572a890c43c5352f57f88c07f290434b4b87df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0f7f45a119de2288c10c793437896cc9f66d5bc4ea5892bb1a954e011b24a2d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x48f1a9889c8ae29c22936aa9c671cc04817b71dd22848c371cbde3e8deec51cc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallGas_d0g0v0_EIP158" : {
+    "RawCallGas_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/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4a",
-                    "hash" : "0xff459d1ec9f566cb86d4a4963ca34907da1ba4786af7f927485df36d72ab1170",
-                    "mixHash" : "0x231177efc541d4bfafde4f3383e307ee0fa11e324ba5f7be74719b9b91c061e1",
-                    "nonce" : "0xa45fb452bdc1c038",
+                    "hash" : "0x5a712010a9a8ce525916763a7b1b2506d0fc9126d9a0bc96e8c0d5ebbc490c40",
+                    "mixHash" : "0x8c49fef1bd790387f560a79f9fe3001d406ca2e420e9d639a4702c78804f9e24",
+                    "nonce" : "0xd5c6c0907b4f39c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
+                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
+                    "stateRoot" : "0xfa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aec",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aeca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a08c49fef1bd790387f560a79f9fe3001d406ca2e420e9d639a4702c78804f9e2488d5c6c0907b4f39c6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5a712010a9a8ce525916763a7b1b2506d0fc9126d9a0bc96e8c0d5ebbc490c40",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x752e"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06aff9"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallGas_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x5799c4b44aaf92f10d45fc2d3b9521846aced5ed000e7ef65bd73c7a25bd28b0",
+                    "mixHash" : "0xe09c5f2eed116673d2303ec222df6216b65009ffdf77f9b77b3cd8c490d108e5",
+                    "nonce" : "0xc29fcddfe768497c",
                     "number" : "0x01",
                     "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
                     "receiptTrie" : "0x4448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da04448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0231177efc541d4bfafde4f3383e307ee0fa11e324ba5f7be74719b9b91c061e188a45fb452bdc1c038f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da04448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0e09c5f2eed116673d2303ec222df6216b65009ffdf77f9b77b3cd8c490d108e588c29fcddfe768497cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff459d1ec9f566cb86d4a4963ca34907da1ba4786af7f927485df36d72ab1170",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5799c4b44aaf92f10d45fc2d3b9521846aced5ed000e7ef65bd73c7a25bd28b0",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallGas_d0g0v0_Frontier" : {
+    "RawCallGas_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/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013cb6",
-                    "hash" : "0x6609802f851ed62e4c51835daa09a8603135045d4a6124ffb1cf6389e0326e8e",
-                    "mixHash" : "0x909ffcb5005ddaa4e66dd09bdd9c7530ca865a3de9e6b65477ab71ba35e15763",
-                    "nonce" : "0xfc120d53e384a462",
+                    "gasUsed" : "0x013f4a",
+                    "hash" : "0x891ad51f403a061d6a521000aa38d63e728d697bd1b7e0a9f00aaac41b4b6f41",
+                    "mixHash" : "0x27258c70b5a36cf35314eef74078351105470f46531a0be8fd659f0cfffe8687",
+                    "nonce" : "0x2f452707c5980a34",
                     "number" : "0x01",
                     "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
-                    "receiptTrie" : "0xad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9",
-                    "stateRoot" : "0xdf8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200",
+                    "receiptTrie" : "0x4448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90",
+                    "stateRoot" : "0x9f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a0909ffcb5005ddaa4e66dd09bdd9c7530ca865a3de9e6b65477ab71ba35e1576388fc120d53e384a462f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f4c3b54d4ea28e971bb06d2f738ed5de5742dd1989bf676404285b647fd4dfba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da04448e084158dfba37a6f8f01425782e2139ccd372d42a6b5c8335dd9bc955d90b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a027258c70b5a36cf35314eef74078351105470f46531a0be8fd659f0cfffe8687882f452707c5980a34f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6609802f851ed62e4c51835daa09a8603135045d4a6124ffb1cf6389e0326e8e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x891ad51f403a061d6a521000aa38d63e728d697bd1b7e0a9f00aaac41b4b6f41",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -318,14 +454,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53cb6",
+                "balance" : "0x4563918244f53f4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d34a",
+                "balance" : "0xe8d4a3d0b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,7 +473,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06b28d"
+                    "0x01" : "0x06aff9"
                 }
             }
         },
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallGas_d0g0v0_Homestead" : {
+    "RawCallGas_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/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013cb6",
-                    "hash" : "0x6c9cf2e30991e135cfe059c856ec11c40fc39f76013c4d06e9b7365ebd470b7e",
-                    "mixHash" : "0x664917981ae13b2c86bbbdf91e3f28c2c90a4800bdc3ad08281ea94b93709791",
-                    "nonce" : "0x94a995fb8e65c38d",
+                    "hash" : "0x3a19bcdc3508ca8e383b319758985c3231cbbea6d92f2d361f2e7c2f580b05d9",
+                    "mixHash" : "0xce9a4b7d4aeb31a5632b0cb9d38e313894237609012005387adec5cb15fdb8f7",
+                    "nonce" : "0x578249c6a858d3a8",
                     "number" : "0x01",
                     "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
                     "receiptTrie" : "0xad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a0664917981ae13b2c86bbbdf91e3f28c2c90a4800bdc3ad08281ea94b937097918894a995fb8e65c38df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a0ce9a4b7d4aeb31a5632b0cb9d38e313894237609012005387adec5cb15fdb8f788578249c6a858d3a8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c9cf2e30991e135cfe059c856ec11c40fc39f76013c4d06e9b7365ebd470b7e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3a19bcdc3508ca8e383b319758985c3231cbbea6d92f2d361f2e7c2f580b05d9",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallGas_d0g0v0_Metropolis" : {
+    "RawCallGas_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f4a",
-                    "hash" : "0xe6bf85d0596efe9262fbec74c0fbdb30984bfc80c259c1ef25977f673226e1eb",
-                    "mixHash" : "0xb45d34fe85d14f6998d8039440a8255f7ff61fa85d89f53da49962f9375d89a7",
-                    "nonce" : "0xed92ff7444c639d3",
+                    "gasUsed" : "0x013cb6",
+                    "hash" : "0x810707f67735acabdf541fdde5189cb3e2cacba13de2e4fbe0558d19f5ab9527",
+                    "mixHash" : "0x0a7b261d1985e9b1c66adea98e05903fe259452d47adc3ce944ba181731102fd",
+                    "nonce" : "0x7dd49cacdd38fd39",
                     "number" : "0x01",
                     "parentHash" : "0x30b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4",
-                    "receiptTrie" : "0x7de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11a",
-                    "stateRoot" : "0xfa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aec",
+                    "receiptTrie" : "0xad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9",
+                    "stateRoot" : "0xdf8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa982b451cbd8d40d0c8d06c687c3c7ac404c2becc2025caa4120ce483d56aeca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da07de92491d69322d413d12c072195a4ccdded6440abac9f7d22b88cf674fce11ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4a8203e880a0b45d34fe85d14f6998d8039440a8255f7ff61fa85d89f53da49962f9375d89a788ed92ff7444c639d3f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a030b4837f7d70458dbbcbee3d5807482b127a3dfb049d8884778c00d7278b66e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df8e42ab1bf460be96fc5b5570aeae601c0050d303e6c68d018c0c5231723200a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ad63b9bc1c92a5fc1a30e583d5b6bc79b200ee1947f9d9be80638c5654817df9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb68203e880a00a7b261d1985e9b1c66adea98e05903fe259452d47adc3ce944ba181731102fd887dd49cacdd38fd39f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444c3e2d7cea6a916a91c2996fa2eb60330bf10d276f8710a6c76279bf38c290a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6bf85d0596efe9262fbec74c0fbdb30984bfc80c259c1ef25977f673226e1eb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x810707f67735acabdf541fdde5189cb3e2cacba13de2e4fbe0558d19f5ab9527",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -569,14 +698,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f4a",
+                "balance" : "0x4563918244f53cb6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b6",
+                "balance" : "0xe8d4a3d34a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -588,7 +717,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06aff9"
+                    "0x01" : "0x06b28d"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0.json
index 89dcae3bf..6df7304d5 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallMemoryGasAsk_d0g0v0_EIP150" : {
+    "RawCallMemoryGasAsk_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/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x013a4503e977d2a7d1cf79981feec6feb856d9ceddd550a48bdb21b1602dc74b",
-                    "mixHash" : "0x9f0b23c2bdb5da7614cde99826eff0ba7a37bdef63ec0f23822219d8cee242f5",
-                    "nonce" : "0x05266f386a4219dd",
+                    "hash" : "0xfa0c9c39806ec583c887c53459215e243271e8a19f760ca36e4564311938118d",
+                    "mixHash" : "0x6a8c117b7d9b0a45ddd1f3deff6634dfa1ec6003594313807b89db3dcf6c1ae4",
+                    "nonce" : "0xa1f012a06b0ae341",
                     "number" : "0x01",
                     "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
-                    "receiptTrie" : "0xcc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459",
-                    "stateRoot" : "0xdbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x2ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a09f0b23c2bdb5da7614cde99826eff0ba7a37bdef63ec0f23822219d8cee242f58805266f386a4219ddf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a06a8c117b7d9b0a45ddd1f3deff6634dfa1ec6003594313807b89db3dcf6c1ae488a1f012a06b0ae341f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x013a4503e977d2a7d1cf79981feec6feb856d9ceddd550a48bdb21b1602dc74b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfa0c9c39806ec583c887c53459215e243271e8a19f760ca36e4564311938118d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallMemoryGasAsk_d0g0v0_EIP158" : {
+    "RawCallMemoryGasAsk_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/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x26a94ca73516138046116055380fcbac2e80b44de925a58722cfe732d84cd60c",
-                    "mixHash" : "0x8ae7e062b63a83cea395f16a4b79180cdad6870d325f69e21cbee56209088863",
-                    "nonce" : "0x231c51b4db567368",
+                    "hash" : "0xb25d1b442789d500f3eb74c0874b887dad732d2da21f637a34a59d42c27ccea3",
+                    "mixHash" : "0xede87043aa7180168ffae9d5b822d43a7284cb4ccb1eb5dacd03e711c9e1857e",
+                    "nonce" : "0x9f17900ece5643c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x2ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0ede87043aa7180168ffae9d5b822d43a7284cb4ccb1eb5dacd03e711c9e1857e889f17900ece5643c6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x87e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb25d1b442789d500f3eb74c0874b887dad732d2da21f637a34a59d42c27ccea3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x06dece"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f542b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3cd4e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallMemoryGasAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0xde75db68e0a25589da18b610f58862f18f022ee6317fc8e4975810447c13abc1",
+                    "mixHash" : "0xa20aca63c2d21d3d905997c10c815378989e48a179a296c2aa012f1e259248d4",
+                    "nonce" : "0x1c25b9f85660e851",
                     "number" : "0x01",
                     "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
                     "receiptTrie" : "0xcc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a08ae7e062b63a83cea395f16a4b79180cdad6870d325f69e21cbee5620908886388231c51b4db567368f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0a20aca63c2d21d3d905997c10c815378989e48a179a296c2aa012f1e259248d4881c25b9f85660e851f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26a94ca73516138046116055380fcbac2e80b44de925a58722cfe732d84cd60c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xde75db68e0a25589da18b610f58862f18f022ee6317fc8e4975810447c13abc1",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallMemoryGasAsk_d0g0v0_Frontier" : {
+    "RawCallMemoryGasAsk_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/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0x13cfc591dd4a185e6edf01ba64e04a0e9ece0588554bf30f3a68626dc767de60",
-                    "mixHash" : "0x725580c197f0de53cc9f304cbb71f2c740097be3a5a84f2c2c9d25f8e394fa03",
-                    "nonce" : "0x76e0f09907b618ac",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0xf4b09da40ce15f6ecdfc41d9fd6e8d78e1315920c39075fa4f434c30ec1229ab",
+                    "mixHash" : "0x528e07199c61ccf0a7a50de2aaaae4c0d7fe5d319c5319d114a7bcf771baa129",
+                    "nonce" : "0x936d0be2fa39aed8",
                     "number" : "0x01",
                     "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
-                    "receiptTrie" : "0xdbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325",
-                    "stateRoot" : "0x824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46",
+                    "receiptTrie" : "0xcc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459",
+                    "stateRoot" : "0xdbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0dbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0725580c197f0de53cc9f304cbb71f2c740097be3a5a84f2c2c9d25f8e394fa038876e0f09907b618acf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf493274c26f11e3df4180136ac855da65914d159ba33d19c9e46f35cb90823a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0cc197f141b7bd194415006175ce655a7169e301868299bea13a2d15facdfe459b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0528e07199c61ccf0a7a50de2aaaae4c0d7fe5d319c5319d114a7bcf771baa12988936d0be2fa39aed8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,25 +442,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13cfc591dd4a185e6edf01ba64e04a0e9ece0588554bf30f3a68626dc767de60",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf4b09da40ce15f6ecdfc41d9fd6e8d78e1315920c39075fa4f434c30ec1229ab",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x06dece"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f542b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3cd4e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +472,8 @@
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawCallMemoryGasAsk_d0g0v0_Homestead" : {
+    "RawCallMemoryGasAsk_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/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0x83a185b93edb319279c5199529e223f96fb9d390eba3760c9aa15695cf192d91",
-                    "mixHash" : "0xaf64e8831ee2f80481b3082f8381ca4668ac1c85c1e550b0ed63025b65172ec7",
-                    "nonce" : "0x045982629863d47d",
+                    "hash" : "0x42b98adca4182469e43536f7f281650a2de3719f511082847250a19d345d3c7d",
+                    "mixHash" : "0xbb3862b3bfcaa99882c133e43244a9154566ec5c4d2a81fa889291e04ff7a8ee",
+                    "nonce" : "0x25a24918b44c45fc",
                     "number" : "0x01",
                     "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
                     "receiptTrie" : "0xdbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0dbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0af64e8831ee2f80481b3082f8381ca4668ac1c85c1e550b0ed63025b65172ec788045982629863d47df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0dbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0bb3862b3bfcaa99882c133e43244a9154566ec5c4d2a81fa889291e04ff7a8ee8825a24918b44c45fcf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83a185b93edb319279c5199529e223f96fb9d390eba3760c9aa15695cf192d91",
-        "network" : "Homestead",
+        "lastblockhash" : "0x42b98adca4182469e43536f7f281650a2de3719f511082847250a19d345d3c7d",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawCallMemoryGasAsk_d0g0v0_Metropolis" : {
+    "RawCallMemoryGasAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142b2",
-                    "hash" : "0x227bb8d10f1fa394bc956d42a8a80653593dd97c28a95072306f185c29493042",
-                    "mixHash" : "0x13c389f178953539f4ab6d541bbf66384d1b5bc5661c085131238188f08ee21b",
-                    "nonce" : "0xd14226066122477d",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0xba0445ebadef2a50a86895c67a508b4477d49553b6541b52de3ef41ddb441a08",
+                    "mixHash" : "0x96b0421f76f739a7ceeb29ab06b25143e97d23e2a0ef92357c2f9d7e6eb04e34",
+                    "nonce" : "0x294c6c1d21c5a4da",
                     "number" : "0x01",
                     "parentHash" : "0x2ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352",
-                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
-                    "stateRoot" : "0x2ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313",
+                    "receiptTrie" : "0xdbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325",
+                    "stateRoot" : "0x824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ef9c22ec748ea0b85cf1bb1c6c804f6d26d18706b03a974f5f5900530829313a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a013c389f178953539f4ab6d541bbf66384d1b5bc5661c085131238188f08ee21b88d14226066122477df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a02ff03321e9a8556d4faff73ad000a53b1ffdde105203c2783fed7d5d903ca352a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824d620090a1220e40e46dbaad997ae51ad15570c09fa9bc3e79e4432a6f6d46a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0dbe2dabb25ac12578e780e01855a3f0eeeb78bad2bc71f44ec4928b11a0ea325b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a096b0421f76f739a7ceeb29ab06b25143e97d23e2a0ef92357c2f9d7e6eb04e3488294c6c1d21c5a4daf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,33 +683,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e79d898aac13b886f48b8c403832f9e939a93e499cbc924ac9472cf0b0b4c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x227bb8d10f1fa394bc956d42a8a80653593dd97c28a95072306f185c29493042",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xba0445ebadef2a50a86895c67a508b4477d49553b6541b52de3ef41ddb441a08",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x06dece"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542b2",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd4e",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,8 +712,6 @@
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06ac91"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0.json
index 6f28b8f4c..138c7043a 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCallMemoryGas_d0g0v0_EIP150" : {
+    "RawCallMemoryGas_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/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x05352f82435e85d9a0f5226261cec593e3b85eee1ea9b6dda8b362a98d8ee464",
-                    "mixHash" : "0x4b9b749bec2a4d06ba845144e966e3828770d8c76c6acf83f5f21e666e54c5f0",
-                    "nonce" : "0x1b360ab840d7414e",
+                    "hash" : "0x8929e08f7b5517897c1dd6d06b8a5328172e9cc922893768b2808587bc75b8fa",
+                    "mixHash" : "0x8b86156cae8bd1aa9e7f6985634e36283b7f6134933a7f188d8716ea8d6cc283",
+                    "nonce" : "0x4a5a378e81dd8a27",
                     "number" : "0x01",
                     "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
-                    "receiptTrie" : "0x8c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5",
-                    "stateRoot" : "0x41acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x2765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a04b9b749bec2a4d06ba845144e966e3828770d8c76c6acf83f5f21e666e54c5f0881b360ab840d7414ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a08b86156cae8bd1aa9e7f6985634e36283b7f6134933a7f188d8716ea8d6cc283884a5a378e81dd8a27f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05352f82435e85d9a0f5226261cec593e3b85eee1ea9b6dda8b362a98d8ee464",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8929e08f7b5517897c1dd6d06b8a5328172e9cc922893768b2808587bc75b8fa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawCallMemoryGas_d0g0v0_EIP158" : {
+    "RawCallMemoryGas_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/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142b2",
-                    "hash" : "0x46a1d7e83a43574040810a3a69a055325be144861d3442dcbebb5a9f26306ff6",
-                    "mixHash" : "0xe076ce63b60cdc1a44a0ff166f490a2c713fd4fd9358e5762e569feb4291f7ef",
-                    "nonce" : "0x931d75a8b7a4518d",
+                    "hash" : "0x82ca4f9e2039ecff4683c6ff699a68af7e370ae3cc8d4b911d02e1f482418ff8",
+                    "mixHash" : "0xb4d2dc05c8e92048779b0759f4682dbd68b0f23e349b23757dd961ca6bda1a7d",
+                    "nonce" : "0xa493e984b1e29892",
+                    "number" : "0x01",
+                    "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
+                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
+                    "stateRoot" : "0x2765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0b4d2dc05c8e92048779b0759f4682dbd68b0f23e349b23757dd961ca6bda1a7d88a493e984b1e29892f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x82ca4f9e2039ecff4683c6ff699a68af7e370ae3cc8d4b911d02e1f482418ff8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x752e"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f542b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3cd4e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac91"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCallMemoryGas_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0x119facc0e8dd071aa08c8d5a7064f32ede00c1b3209807efcc0d0f570727f7c1",
+                    "mixHash" : "0xbc000756de651479998781a4bd384824c8ed04660df90c316fd77cd5e287b3ef",
+                    "nonce" : "0x9bc333b0f73793a8",
                     "number" : "0x01",
                     "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
                     "receiptTrie" : "0x8c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0e076ce63b60cdc1a44a0ff166f490a2c713fd4fd9358e5762e569feb4291f7ef88931d75a8b7a4518df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0bc000756de651479998781a4bd384824c8ed04660df90c316fd77cd5e287b3ef889bc333b0f73793a8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46a1d7e83a43574040810a3a69a055325be144861d3442dcbebb5a9f26306ff6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x119facc0e8dd071aa08c8d5a7064f32ede00c1b3209807efcc0d0f570727f7c1",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawCallMemoryGas_d0g0v0_Frontier" : {
+    "RawCallMemoryGas_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/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01401e",
-                    "hash" : "0x5e9eefd4b0e5379a146b7ff31fa35210b6c11769753d1f2457d39240de8daa12",
-                    "mixHash" : "0x00d3081e6a618ae74d892746ebf64829a1f4d2a335a40f954bd9e7621823ec0a",
-                    "nonce" : "0xcc71e67b3fce93b2",
+                    "gasUsed" : "0x0142b2",
+                    "hash" : "0xc61c773eb40c9e8fd6f91d41413fb079776fcf4b2643497c61d13b9c15e18d55",
+                    "mixHash" : "0xec63bba99e62dfa7dcf1cfc66f3a416c7092823f929bd20ec5c58d00205f8642",
+                    "nonce" : "0xb077d8d2af287b89",
                     "number" : "0x01",
                     "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
-                    "receiptTrie" : "0x075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252",
-                    "stateRoot" : "0x221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93a",
+                    "receiptTrie" : "0x8c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5",
+                    "stateRoot" : "0x41acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a000d3081e6a618ae74d892746ebf64829a1f4d2a335a40f954bd9e7621823ec0a88cc71e67b3fce93b2f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041acdd021e8749c177bde93a53371ec8bb050c4844bc2f8b621d0427e37d6837a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c93b19bb64e9867ec8a7afc6aecbb6a46c338ea7c17d0a51e122085902d3cb5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a0ec63bba99e62dfa7dcf1cfc66f3a416c7092823f929bd20ec5c58d00205f864288b077d8d2af287b89f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e9eefd4b0e5379a146b7ff31fa35210b6c11769753d1f2457d39240de8daa12",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc61c773eb40c9e8fd6f91d41413fb079776fcf4b2643497c61d13b9c15e18d55",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -318,14 +454,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5401e",
+                "balance" : "0x4563918244f542b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cfe2",
+                "balance" : "0xe8d4a3cd4e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,7 +473,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06af25"
+                    "0x01" : "0x06ac91"
                 }
             }
         },
@@ -365,10 +501,10 @@
             }
         }
     },
-    "RawCallMemoryGas_d0g0v0_Homestead" : {
+    "RawCallMemoryGas_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/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01401e",
-                    "hash" : "0xd9788fcd41c5860c83bfdd4630a652aa812d8e8d73072af7c4be13579e27e6b9",
-                    "mixHash" : "0x8b513fc5b46ae91f7f47ad4424f618f3310a983c9e5d7f9a222d6743a6f02b14",
-                    "nonce" : "0xd946c1f9036d7022",
+                    "hash" : "0x8253f7761fd78477249eec4c3d087b3ede8312038ff1ccd3bf60c237ee99a760",
+                    "mixHash" : "0x295f3c215432b5bd671c3692c1c5c8561d5a2367b1438df8bea18033f06e7e1c",
+                    "nonce" : "0x0aeac718b45cf734",
                     "number" : "0x01",
                     "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
                     "receiptTrie" : "0x075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a08b513fc5b46ae91f7f47ad4424f618f3310a983c9e5d7f9a222d6743a6f02b1488d946c1f9036d7022f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a0295f3c215432b5bd671c3692c1c5c8561d5a2367b1438df8bea18033f06e7e1c880aeac718b45cf734f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9788fcd41c5860c83bfdd4630a652aa812d8e8d73072af7c4be13579e27e6b9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8253f7761fd78477249eec4c3d087b3ede8312038ff1ccd3bf60c237ee99a760",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "RawCallMemoryGas_d0g0v0_Metropolis" : {
+    "RawCallMemoryGas_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCallMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142b2",
-                    "hash" : "0x3c053a9ab5f419cb89bc21928b1a668ea4159a112e95c80e1a916126f239bf57",
-                    "mixHash" : "0x01b175bc6c12bc30438aceade180c6ebd8520f8505eaf0a5047d34f1e73a0653",
-                    "nonce" : "0x39ecd2c406663627",
+                    "gasUsed" : "0x01401e",
+                    "hash" : "0x9f3428fc26bd66a6a581710f90b1950c76a90fa08b03133634ef30a23eb7c4e6",
+                    "mixHash" : "0x6a3a086331ff736c8c13b6df103049789459a77718736f3ce88f6cf8ff1f94e6",
+                    "nonce" : "0xb5fbd3ff78bc7b93",
                     "number" : "0x01",
                     "parentHash" : "0xd50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326",
-                    "receiptTrie" : "0x6bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8",
-                    "stateRoot" : "0x2765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8a",
+                    "receiptTrie" : "0x075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252",
+                    "stateRoot" : "0x221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02765ad80562bf8fb9f2a72907f30d4e5b3b8521b38226f9728edd5fce0f51c8aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06bfc15daf2b9ec6ada4560b85ba333ecb494fe3a2c4dbfa1359d54f74e0ab6d8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142b28203e880a001b175bc6c12bc30438aceade180c6ebd8520f8505eaf0a5047d34f1e73a06538839ecd2c406663627f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0d50a654b3aba04e8f1cadf9add2b408aee1c334328dc1dff66ac9b11d898e326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0221b3f16576ea6ada9e5898334ff6f53c4632b666c9eb64edc250fcc88cca93aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0075e0f5439f75a7bbbb52e130b6ab24da84f3ff0fa5364cb2cd768293d0d9252b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401e8203e880a06a3a086331ff736c8c13b6df103049789459a77718736f3ce88f6cf8ff1f94e688b5fbd3ff78bc7b93f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0575a2314b775b44e07bfd243ebaa3bafbde6bdaae132b1e27b7f3434365e1313a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c053a9ab5f419cb89bc21928b1a668ea4159a112e95c80e1a916126f239bf57",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9f3428fc26bd66a6a581710f90b1950c76a90fa08b03133634ef30a23eb7c4e6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -569,14 +698,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542b2",
+                "balance" : "0x4563918244f5401e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd4e",
+                "balance" : "0xe8d4a3cfe2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -588,7 +717,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06ac91"
+                    "0x01" : "0x06af25"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0.json
index ebe079795..347db226d 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateFailGasValueTransfer2_d0g0v0_EIP150" : {
+    "RawCreateFailGasValueTransfer2_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x5522fd269c9681c4abfc93b76326ac4554f97418ab12ac6863ee0b85f246a8d7",
-                    "mixHash" : "0xb72c9824389f17b0ec6288aa6df3e9887247ecedcf2eb2cf78dbe4fb3e31be74",
-                    "nonce" : "0x3d8b4526bd5e10df",
+                    "hash" : "0xe9a0edf229e70c6618e685a0b0b0af2211e7f79ae8287977df4bf1587124786f",
+                    "mixHash" : "0x91fdbc0db0a7306d7d294cbafe28b96797a2faf131a8f13c2297a6965040262a",
+                    "nonce" : "0xe1290e07ca9f662e",
                     "number" : "0x01",
                     "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
-                    "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
-                    "stateRoot" : "0xdef880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0xa83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0b72c9824389f17b0ec6288aa6df3e9887247ecedcf2eb2cf78dbe4fb3e31be74883d8b4526bd5e10dff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaaa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a091fdbc0db0a7306d7d294cbafe28b96797a2faf131a8f13c2297a6965040262a88e1290e07ca9f662ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5522fd269c9681c4abfc93b76326ac4554f97418ab12ac6863ee0b85f246a8d7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe9a0edf229e70c6618e685a0b0b0af2211e7f79ae8287977df4bf1587124786f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer2_d0g0v0_EIP158" : {
+    "RawCreateFailGasValueTransfer2_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x786d5c81b87845b246b1bda2b8ba2b6618c97ca41b6003f0a36305ecdc489f1e",
-                    "mixHash" : "0xd97d860df165683d4650979a6b2dac76c2826686aa931515a9d9a9328ee17dd2",
-                    "nonce" : "0xa76ef0093b0a58a5",
+                    "hash" : "0x9bf4924497d411f7a518f2c06d6eb259ce051528f30aa87b721afd9a5c615cf2",
+                    "mixHash" : "0x030386b4dafc5be30e5d5091bfe94d4612da43d893bb13e44912115cdac3e349",
+                    "nonce" : "0xc03e213705f321b9",
                     "number" : "0x01",
                     "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
-                    "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
-                    "stateRoot" : "0xdef880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0xa83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0d97d860df165683d4650979a6b2dac76c2826686aa931515a9d9a9328ee17dd288a76ef0093b0a58a5f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaaa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0030386b4dafc5be30e5d5091bfe94d4612da43d893bb13e44912115cdac3e34988c03e213705f321b9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x786d5c81b87845b246b1bda2b8ba2b6618c97ca41b6003f0a36305ecdc489f1e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9bf4924497d411f7a518f2c06d6eb259ce051528f30aa87b721afd9a5c615cf2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer2_d0g0v0_Frontier" : {
+    "RawCreateFailGasValueTransfer2_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x3430057d798093c57101838bbd7e156fb30fa7aa3e27b61dbf9eabbbdda1cf7d",
-                    "mixHash" : "0x986b7ae19b7447bef68a4296eb0df77c61fcfa1e51a9251051f038047ffaf505",
-                    "nonce" : "0x0ecdca9aa6a68f7d",
+                    "hash" : "0x91e4ebca5530ebdb62974105a1836a6cf81602c1770ec81f34096adf6fb35a13",
+                    "mixHash" : "0xa33ed3b18286e5d08e34de673bf05bfa47b2a22d422399b8002fa11257fb8f72",
+                    "nonce" : "0xc537b551f3fa7d5e",
                     "number" : "0x01",
                     "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
                     "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0986b7ae19b7447bef68a4296eb0df77c61fcfa1e51a9251051f038047ffaf505880ecdca9aa6a68f7df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0a33ed3b18286e5d08e34de673bf05bfa47b2a22d422399b8002fa11257fb8f7288c537b551f3fa7d5ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3430057d798093c57101838bbd7e156fb30fa7aa3e27b61dbf9eabbbdda1cf7d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x91e4ebca5530ebdb62974105a1836a6cf81602c1770ec81f34096adf6fb35a13",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer2_d0g0v0_Homestead" : {
+    "RawCreateFailGasValueTransfer2_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0xae36af70dd1d830557e916271ff8e7e9f9ddbcb78170f4b706d28aaba5bcef3c",
-                    "mixHash" : "0x76b9683dbf40cadde92d16e8fc6d8ff67df6fff886d5c4bcedb4c63b93dfeba1",
-                    "nonce" : "0x303de90c56b421d7",
+                    "hash" : "0x136f9de21ad536f398525df56f54ddfbcbfbab5cdb889a394ce4fed7709bc9eb",
+                    "mixHash" : "0x732adbb70db5debb17284a20478f4ab6d3d11e880f5ecc37ee8f8dc04f4698a1",
+                    "nonce" : "0xb7f5794931732351",
                     "number" : "0x01",
                     "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
                     "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a076b9683dbf40cadde92d16e8fc6d8ff67df6fff886d5c4bcedb4c63b93dfeba188303de90c56b421d7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0732adbb70db5debb17284a20478f4ab6d3d11e880f5ecc37ee8f8dc04f4698a188b7f5794931732351f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae36af70dd1d830557e916271ff8e7e9f9ddbcb78170f4b706d28aaba5bcef3c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x136f9de21ad536f398525df56f54ddfbcbfbab5cdb889a394ce4fed7709bc9eb",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer2_d0g0v0_Metropolis" : {
+    "RawCreateFailGasValueTransfer2_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0xbd42e3c8388bbe05c46f88d81db43a8672c0d7a190fd3f72c0cafa647a682fa9",
-                    "mixHash" : "0x1dc50a1f7e98541a1bb49d7e03eac670139317a51d73e3f72753b29c1f60e036",
-                    "nonce" : "0x3c11e3df6c931c0b",
+                    "hash" : "0xa0dd521aee4a53e4db66227ad6fb557e400b429d26127367b41fc57cb967b659",
+                    "mixHash" : "0xc7a2fc79003e30851a9cb50004c4b5285fda3894ba8813d77efffc3bac2b3d40",
+                    "nonce" : "0x543412e6fee5b480",
                     "number" : "0x01",
                     "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
-                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
-                    "stateRoot" : "0xa83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaa",
+                    "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
+                    "stateRoot" : "0xdef880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a83d6931a707bf0eaf50583f35b0ce2fbc0c9c9dab574989af5b7d71e99aefaaa01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a01dc50a1f7e98541a1bb49d7e03eac670139317a51d73e3f72753b29c1f60e036883c11e3df6c931c0bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0c7a2fc79003e30851a9cb50004c4b5285fda3894ba8813d77efffc3bac2b3d4088543412e6fee5b480f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd42e3c8388bbe05c46f88d81db43a8672c0d7a190fd3f72c0cafa647a682fa9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa0dd521aee4a53e4db66227ad6fb557e400b429d26127367b41fc57cb967b659",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56ec5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a131",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a600055611f406000600bf0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06807e"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000600bf0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateFailGasValueTransfer2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016ec5",
+                    "hash" : "0x7d5b761619dcb0d4b1937bc9aee41ea679b2235aca8ff3475ce17c19c1c35125",
+                    "mixHash" : "0x1fd144ebf2f1a164c28e9cac21452d6c81805737dd0d564352aa68fc478024fe",
+                    "nonce" : "0xd8a981ef93b141e2",
+                    "number" : "0x01",
+                    "parentHash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
+                    "receiptTrie" : "0x2e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8da",
+                    "stateRoot" : "0xdef880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a02af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def880d07cc6884da228903123c0acfd6b2b557ddac4dae8fbc9115007d0e325a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a02e581da00661d211dcd247db2cd05a734796c0604d70b84981531b4f06c3a8dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a01fd144ebf2f1a164c28e9cac21452d6c81805737dd0d564352aa68fc478024fe88d8a981ef93b141e2f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2af2660f0f90885c99d47312934e89bb3ae8153814aa1b35d2118ac0062823bd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a71d7f9a3046fba4d66a747708dc34f5bdbbc00344d49e488974b4f6f42cd5dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7d5b761619dcb0d4b1937bc9aee41ea679b2235aca8ff3475ce17c19c1c35125",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0.json
index 756b127bd..fd7420636 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateFailGasValueTransfer_d0g0v0_EIP150" : {
+    "RawCreateFailGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x6b6598eefc18b9e23860a2b876861dd4805c3231b6fabecda7f41ccf0c2c7cd7",
-                    "mixHash" : "0x82e095749af54cb037e7f59d9058dbd37a3da89d24664f3f60b28bc9c2fa9316",
-                    "nonce" : "0x41b5926ee99f6e09",
+                    "hash" : "0x5de0d1b20a123e8df452cf7502642b037103f8b173da348f0892aa399205f694",
+                    "mixHash" : "0xf9c5585041e86f7cd17990182497870705087f53ab2a9e1b6e4529168715e189",
+                    "nonce" : "0xadb319075097a956",
                     "number" : "0x01",
                     "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
-                    "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
-                    "stateRoot" : "0x43fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x76b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a082e095749af54cb037e7f59d9058dbd37a3da89d24664f3f60b28bc9c2fa93168841b5926ee99f6e09f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0f9c5585041e86f7cd17990182497870705087f53ab2a9e1b6e4529168715e18988adb319075097a956f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b6598eefc18b9e23860a2b876861dd4805c3231b6fabecda7f41ccf0c2c7cd7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5de0d1b20a123e8df452cf7502642b037103f8b173da348f0892aa399205f694",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer_d0g0v0_EIP158" : {
+    "RawCreateFailGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xcc26121d040b1ca8b8c3083be39577f9ea0e124dcc166a1140cce7eac28d93a8",
-                    "mixHash" : "0x6a82bdbd58dcd86c145fcb8d54a976998c75f2c3acc9032bea880d6e15d190b5",
-                    "nonce" : "0x38f69b3b3c1cafa6",
+                    "hash" : "0xbece99edc8b0e9cf8c394245ddfb9f3a5fabc04bb7dacbfa974459886ceb52dd",
+                    "mixHash" : "0x1c04aa0a1f5877472a917c0e49da71ef244273a81e4dc28980e307516b57f4c7",
+                    "nonce" : "0x26477428dd52ebec",
                     "number" : "0x01",
                     "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
-                    "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
-                    "stateRoot" : "0x43fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x76b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a06a82bdbd58dcd86c145fcb8d54a976998c75f2c3acc9032bea880d6e15d190b58838f69b3b3c1cafa6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a01c04aa0a1f5877472a917c0e49da71ef244273a81e4dc28980e307516b57f4c78826477428dd52ebecf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc26121d040b1ca8b8c3083be39577f9ea0e124dcc166a1140cce7eac28d93a8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbece99edc8b0e9cf8c394245ddfb9f3a5fabc04bb7dacbfa974459886ceb52dd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer_d0g0v0_Frontier" : {
+    "RawCreateFailGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xbd754d7fd3d71fa45a93de268bdf960e0357dc8bd7d5b4c69dd0262b29500c1b",
-                    "mixHash" : "0xf698c3c1d9247568377390f042af4b8e724334b68c03a646310bae290d9ed8d0",
-                    "nonce" : "0xd792e54047646614",
+                    "hash" : "0xd28f38a06e72bda341425092aea88f5d8dcffc25eb95eef93d565f30727bebb9",
+                    "mixHash" : "0x639f1a8ea264e152f07f19c82693b2cbc6962310033b7d38a27ab233848a1bd0",
+                    "nonce" : "0x93a2160ddf4932bb",
                     "number" : "0x01",
                     "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
                     "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0f698c3c1d9247568377390f042af4b8e724334b68c03a646310bae290d9ed8d088d792e54047646614f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0639f1a8ea264e152f07f19c82693b2cbc6962310033b7d38a27ab233848a1bd08893a2160ddf4932bbf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd754d7fd3d71fa45a93de268bdf960e0357dc8bd7d5b4c69dd0262b29500c1b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd28f38a06e72bda341425092aea88f5d8dcffc25eb95eef93d565f30727bebb9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer_d0g0v0_Homestead" : {
+    "RawCreateFailGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xf82eb795e2711f7940fa1b31c2b2c76a14520a4845c3e31978489eb07c7bdbca",
-                    "mixHash" : "0x393e6f00f322fb37a0eb9a9b20f6f36d1aa1821b6bb2feec86aafbc9236948e6",
-                    "nonce" : "0x95a309c064070ec9",
+                    "hash" : "0xcf4b2d5243409e0ab5f5bfea99c68cf3303d9e044682c69872661ce9ae1948f2",
+                    "mixHash" : "0x5280ea67f4889645dc2ed046ec6fdfd1aa112767e3820d1893e13fb1387e718c",
+                    "nonce" : "0xb98243f1dbf261a1",
                     "number" : "0x01",
                     "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
                     "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0393e6f00f322fb37a0eb9a9b20f6f36d1aa1821b6bb2feec86aafbc9236948e68895a309c064070ec9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a05280ea67f4889645dc2ed046ec6fdfd1aa112767e3820d1893e13fb1387e718c88b98243f1dbf261a1f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf82eb795e2711f7940fa1b31c2b2c76a14520a4845c3e31978489eb07c7bdbca",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcf4b2d5243409e0ab5f5bfea99c68cf3303d9e044682c69872661ce9ae1948f2",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "RawCreateFailGasValueTransfer_d0g0v0_Metropolis" : {
+    "RawCreateFailGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x8e702740fc4c02e5173fe45f077ecd0d2b5f779bb655c81869f004e15bb2f369",
-                    "mixHash" : "0x38ea6703d3b31e994ca0b75e05d7edfdc927f2bc9eb03505ef430a98dd89088a",
-                    "nonce" : "0x50b6b6b6ff8be995",
+                    "hash" : "0xba8cd200b18a6c99001d44a1e28607f4903f4148b192b49bfcdfe2167d2ed34e",
+                    "mixHash" : "0x9d1f25908de3cda4f4b4117fd8af6361ffa6252aeafed1102adcdbc3aa69cb13",
+                    "nonce" : "0xc84b406fba738014",
                     "number" : "0x01",
                     "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0x76b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62e",
+                    "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
+                    "stateRoot" : "0x43fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076b8fcdfee602505753558e7b61acdbb92023eb657a4cf4c42b294c60e49f62ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a038ea6703d3b31e994ca0b75e05d7edfdc927f2bc9eb03505ef430a98dd89088a8850b6b6b6ff8be995f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a09d1f25908de3cda4f4b4117fd8af6361ffa6252aeafed1102adcdbc3aa69cb1388c84b406fba738014f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e702740fc4c02e5173fe45f077ecd0d2b5f779bb655c81869f004e15bb2f369",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xba8cd200b18a6c99001d44a1e28607f4903f4148b192b49bfcdfe2167d2ed34e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a499",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x5a60005560006000600bf0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0683e6"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005560006000600bf0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateFailGasValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0xf8ca6f1fd37a4778813f27fccc4a70bfa487a60608fbdf3a69f2489649769dc0",
+                    "mixHash" : "0x59725bc6a37a41173cf32e85df6f03522cacd6f2e7cc9eb5c7a2dd028c12eb73",
+                    "nonce" : "0x80fbb437574fdc06",
+                    "number" : "0x01",
+                    "parentHash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
+                    "receiptTrie" : "0x1bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8",
+                    "stateRoot" : "0x43fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043fb76c6055addec62ab4a5d0131e40a3995076d8c78d6fd8d81a612d6554aa2a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a01bb393edd5a3ccb4a13af0d55a95207998ed03b73b160491760ad61702f39cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a059725bc6a37a41173cf32e85df6f03522cacd6f2e7cc9eb5c7a2dd028c12eb738880fbb437574fdc06f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbf11ff23835a11736025ffe0f41239ffb46ff4eadda8788c7151994c23d02851",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d66194f988f70805c0dc80b809b96016855871dd416ef22d7a60d528ef19dc9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf8ca6f1fd37a4778813f27fccc4a70bfa487a60608fbdf3a69f2489649769dc0",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0.json
index eb539b5fe..70dcb2b5a 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateGasMemory_d0g0v0_EIP150" : {
+    "RawCreateGasMemory_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/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x930e08081d7aa6fa33c4e4a38832ed82b9213ae8a37aabba742eef2a135d0fe5",
-                    "mixHash" : "0x360f96a2207d11b3dda2857e08d9dda35bbdd5bc9b4fc2561982d9fdea92971a",
-                    "nonce" : "0x899ccfdcca9d1d35",
+                    "hash" : "0xd9aa9468ae64e3db45e7fe3a4852db80b404328907ce3e2bb736e7da562a6a5c",
+                    "mixHash" : "0x2217ac043f218a8082205840575f7941c719d1d68dd881652d84f68ee5b71e1f",
+                    "nonce" : "0x084c1aa65e361447",
                     "number" : "0x01",
                     "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
-                    "receiptTrie" : "0x2a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555a",
-                    "stateRoot" : "0x2ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31c",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0x7d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0360f96a2207d11b3dda2857e08d9dda35bbdd5bc9b4fc2561982d9fdea92971a88899ccfdcca9d1d35f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a02217ac043f218a8082205840575f7941c719d1d68dd881652d84f68ee5b71e1f88084c1aa65e361447f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x930e08081d7aa6fa33c4e4a38832ed82b9213ae8a37aabba742eef2a135d0fe5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd9aa9468ae64e3db45e7fe3a4852db80b404328907ce3e2bb736e7da562a6a5c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -91,7 +98,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RawCreateGasMemory_d0g0v0_EIP158" : {
+    "RawCreateGasMemory_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/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x04558a24d005dcfc4e1b972128264c4878065b82fe433ff8e9a61615bb516a71",
-                    "mixHash" : "0x3dfbbee8aef446eaf2da7af72aaafc0398e4efef1ee3d3652dfe7eda97a6f0ea",
-                    "nonce" : "0xd3d8f1adf5e96d64",
+                    "hash" : "0x18d56b9b0c6347a25c2716b2c83cc6877d79f52dfde8e71d62c5b57bf6ae4d55",
+                    "mixHash" : "0x5501d83e0a56f7d4c1a8aa243d6b133449489b88126990558de89d6a20b64531",
+                    "nonce" : "0xaa15fba9b2a47fdf",
                     "number" : "0x01",
                     "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
-                    "receiptTrie" : "0xec745571e5eeda58334dc37287fa8417a34eb74be60923ce61ba18dbde1c0aeb",
-                    "stateRoot" : "0x3682f24629929f9efc11eb5b785503dcc606fc176167adb62a568739c41af6a5",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0x7d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03682f24629929f9efc11eb5b785503dcc606fc176167adb62a568739c41af6a5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec745571e5eeda58334dc37287fa8417a34eb74be60923ce61ba18dbde1c0aebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a03dfbbee8aef446eaf2da7af72aaafc0398e4efef1ee3d3652dfe7eda97a6f0ea88d3d8f1adf5e96d64f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a05501d83e0a56f7d4c1a8aa243d6b133449489b88126990558de89d6a20b6453188aa15fba9b2a47fdff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04558a24d005dcfc4e1b972128264c4878065b82fe433ff8e9a61615bb516a71",
-        "network" : "EIP158",
+        "lastblockhash" : "0x18d56b9b0c6347a25c2716b2c83cc6877d79f52dfde8e71d62c5b57bf6ae4d55",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RawCreateGasMemory_d0g0v0_Frontier" : {
+    "RawCreateGasMemory_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/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +256,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0xc341728b42a01a1f91394b4f0de2d8101649784317cbcc654adf2787a1c306f3",
-                    "mixHash" : "0xf62aebeaa6d6b293ecb70ba587274ec41b77b8208d5d2d68055aaa1c5f0cd2ee",
-                    "nonce" : "0xf4436ade3e23fa98",
+                    "hash" : "0x71b12f9a0551bc74e360e447fdca43922184bd7158920475bc93dc69db7ff21f",
+                    "mixHash" : "0x72546d7a7bd6e49e4219f7e2e1dfe5a6c23d8c66898117f84b6648c5fda0513c",
+                    "nonce" : "0x174505e3055bd3b9",
                     "number" : "0x01",
                     "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
                     "receiptTrie" : "0x2a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555a",
@@ -253,7 +267,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0f62aebeaa6d6b293ecb70ba587274ec41b77b8208d5d2d68055aaa1c5f0cd2ee88f4436ade3e23fa98f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a072546d7a7bd6e49e4219f7e2e1dfe5a6c23d8c66898117f84b6648c5fda0513c88174505e3055bd3b9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc341728b42a01a1f91394b4f0de2d8101649784317cbcc654adf2787a1c306f3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x71b12f9a0551bc74e360e447fdca43922184bd7158920475bc93dc69db7ff21f",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RawCreateGasMemory_d0g0v0_Homestead" : {
+    "RawCreateGasMemory_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/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0xcf4d9e1de475437d4fdecd1f851d49a22ac170f86037516865e936632a000c4d",
-                    "mixHash" : "0x6e3f79ce5ae8bd5af68fd13584b1854720175f94acf4f8baee857d26a84cf77e",
-                    "nonce" : "0x6ab7d36ed1e34dfe",
+                    "hash" : "0xf191afccb3ada2c39a91f9829a2d96da37af96d6220e960a010f61c603c1acc6",
+                    "mixHash" : "0x69ceb121b3e5794453194b3f35f7d7c1cc2b18ec844acc2a6f028f48019250d8",
+                    "nonce" : "0xa3fabd5b174271da",
                     "number" : "0x01",
                     "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
-                    "receiptTrie" : "0x2a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555a",
-                    "stateRoot" : "0x2ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31c",
+                    "receiptTrie" : "0xec745571e5eeda58334dc37287fa8417a34eb74be60923ce61ba18dbde1c0aeb",
+                    "stateRoot" : "0x3682f24629929f9efc11eb5b785503dcc606fc176167adb62a568739c41af6a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a06e3f79ce5ae8bd5af68fd13584b1854720175f94acf4f8baee857d26a84cf77e886ab7d36ed1e34dfef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03682f24629929f9efc11eb5b785503dcc606fc176167adb62a568739c41af6a5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec745571e5eeda58334dc37287fa8417a34eb74be60923ce61ba18dbde1c0aebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a069ceb121b3e5794453194b3f35f7d7c1cc2b18ec844acc2a6f028f48019250d888a3fabd5b174271daf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf4d9e1de475437d4fdecd1f851d49a22ac170f86037516865e936632a000c4d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf191afccb3ada2c39a91f9829a2d96da37af96d6220e960a010f61c603c1acc6",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -433,7 +447,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RawCreateGasMemory_d0g0v0_Metropolis" : {
+    "RawCreateGasMemory_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/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -470,18 +484,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x5a39a5dd49b72180703dbe26f54f62e3221707a36893028c54d1c9a2eb1fe34c",
-                    "mixHash" : "0x7093cab535e4916b2c0da620288e3f2e482d909ed6123b49928b47fac82b789b",
-                    "nonce" : "0xb93928ed663e885f",
+                    "hash" : "0x33e96b4616fbd0e39bb74d24cbe61da0229bcef48adf78485b2f9f5e031555c7",
+                    "mixHash" : "0x3546ad98ac5841a01138c7ce4afc1d94d038c9a3d814ad0e6e85cf302b7888d3",
+                    "nonce" : "0xae6f211c4cda14b4",
                     "number" : "0x01",
                     "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
-                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
-                    "stateRoot" : "0x7d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6c",
+                    "receiptTrie" : "0x2a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555a",
+                    "stateRoot" : "0x2ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d14b965955e74fbdc9d98e3a65188aca79dfe661caf6bc68b528ff066096c6ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a07093cab535e4916b2c0da620288e3f2e482d909ed6123b49928b47fac82b789b88b93928ed663e885ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a03546ad98ac5841a01138c7ce4afc1d94d038c9a3d814ad0e6e85cf302b7888d388ae6f211c4cda14b4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +532,123 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a39a5dd49b72180703dbe26f54f62e3221707a36893028c54d1c9a2eb1fe34c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x33e96b4616fbd0e39bb74d24cbe61da0229bcef48adf78485b2f9f5e031555c7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56ec5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a13b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f4060006000f0505a600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06807e"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f4060006000f0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateGasMemory_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateGasMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016ec5",
+                    "hash" : "0x2fc0428f0063f9c3231b01f9f944030a6337f40dc1410b731553d62c135bb078",
+                    "mixHash" : "0xb036942d2516f4993b488eadd1f410745ba10d2500616e2815ef58d906e5eb13",
+                    "nonce" : "0xc5af163148a4fee4",
+                    "number" : "0x01",
+                    "parentHash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
+                    "receiptTrie" : "0x2a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555a",
+                    "stateRoot" : "0x2ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ffc6cef8e6ad665eea7f4c32610be09dd4f2bbf3e7836401aa9d709128be31ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da02a52df1334d6176b190af198ac531c0362725dfcb61a0c042e8e610bc667555ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0b036942d2516f4993b488eadd1f410745ba10d2500616e2815ef58d906e5eb1388c5af163148a4fee4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3c514cd0b5ceb53a13b2e2f62b6313b1e4c4f95fbffbc07dbd65e7307ef722ec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09c67916c0c4cf628190700e122cb6e3678d8649bc3ebc60f3d64f9e27ab0e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fc0428f0063f9c3231b01f9f944030a6337f40dc1410b731553d62c135bb078",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -554,7 +675,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0.json
index 2f44da4e7..e00f843ae 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateGasValueTransferMemory_d0g0v0_EIP150" : {
+    "RawCreateGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x402b6e09d53284e4aa652c77bc5fe2b0a00de31772963e153eb06a727d688fb2",
-                    "mixHash" : "0x0013f67289259f83f46e63a77affdfc20b9d53c101bd674117e395c2b32edb38",
-                    "nonce" : "0x8fa7ada16736e288",
+                    "hash" : "0xa69bcb6cfaef733baefcd84b6efee6ec6587f91071b15bacb35cdeb12dd85286",
+                    "mixHash" : "0x2cd91c4f854fbd1f9ea35a45732e7d421e58f8d22e166dbe415ec20ef221f65b",
+                    "nonce" : "0xa46c0a7fec5cf445",
                     "number" : "0x01",
                     "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
-                    "receiptTrie" : "0x31e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5",
-                    "stateRoot" : "0x2a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0x020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a00013f67289259f83f46e63a77affdfc20b9d53c101bd674117e395c2b32edb38888fa7ada16736e288f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a02cd91c4f854fbd1f9ea35a45732e7d421e58f8d22e166dbe415ec20ef221f65b88a46c0a7fec5cf445f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x402b6e09d53284e4aa652c77bc5fe2b0a00de31772963e153eb06a727d688fb2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa69bcb6cfaef733baefcd84b6efee6ec6587f91071b15bacb35cdeb12dd85286",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -91,7 +98,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RawCreateGasValueTransferMemory_d0g0v0_EIP158" : {
+    "RawCreateGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x42e14c66855c27c912ac7e3f39e927b8e1e0ad877471f6f27ec8e6869e207920",
-                    "mixHash" : "0xfc347fd33033524855223b18cc7431d05cf13c527f0d483024159a9719a7ff75",
-                    "nonce" : "0x4acaf7a8506a77b4",
+                    "hash" : "0xb7aa037dbceda85b368e2b0361ea35ac20a598991c33f87d65e6fed236b9c9b9",
+                    "mixHash" : "0xd20757fd229ce28e754c9ce26b4e3d8d99589957ecda7a0b92dcc0b5edc040b5",
+                    "nonce" : "0x9030b43dfce2e9c8",
                     "number" : "0x01",
                     "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
-                    "receiptTrie" : "0xf6d3a6af474476f3f6da4eb8170739c5a7d13d5e8e15bb60745912cf7651c1c1",
-                    "stateRoot" : "0xc82ed6928d97a18ea4bc23cff4035475a001fdad598d922474e67d71e7d0244e",
+                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
+                    "stateRoot" : "0x020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c82ed6928d97a18ea4bc23cff4035475a001fdad598d922474e67d71e7d0244ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0f6d3a6af474476f3f6da4eb8170739c5a7d13d5e8e15bb60745912cf7651c1c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0fc347fd33033524855223b18cc7431d05cf13c527f0d483024159a9719a7ff75884acaf7a8506a77b4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0d20757fd229ce28e754c9ce26b4e3d8d99589957ecda7a0b92dcc0b5edc040b5889030b43dfce2e9c8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42e14c66855c27c912ac7e3f39e927b8e1e0ad877471f6f27ec8e6869e207920",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb7aa037dbceda85b368e2b0361ea35ac20a598991c33f87d65e6fed236b9c9b9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RawCreateGasValueTransferMemory_d0g0v0_Frontier" : {
+    "RawCreateGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +256,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x3b3b5173f1925fa6f86761d19fd9cec48a6553a548a6df5e1f0052dcdedf687d",
-                    "mixHash" : "0x7d55ced37197d51643c567f50224b4b6e7602113c69113c987a04fb8ff5af460",
-                    "nonce" : "0x03092530870917c8",
+                    "hash" : "0xd13138d4800e0ebb0aa82af9df9d0e11f039fd64e0e36e86b1a732fbb4fc8a02",
+                    "mixHash" : "0x3e44511327f936f3ab7eb5152a3d0c97744ed3691802d6864a38bec7c50eac52",
+                    "nonce" : "0xb0ea5e04bdecb3e7",
                     "number" : "0x01",
                     "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
                     "receiptTrie" : "0x31e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5",
@@ -253,7 +267,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a07d55ced37197d51643c567f50224b4b6e7602113c69113c987a04fb8ff5af4608803092530870917c8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a03e44511327f936f3ab7eb5152a3d0c97744ed3691802d6864a38bec7c50eac5288b0ea5e04bdecb3e7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b3b5173f1925fa6f86761d19fd9cec48a6553a548a6df5e1f0052dcdedf687d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd13138d4800e0ebb0aa82af9df9d0e11f039fd64e0e36e86b1a732fbb4fc8a02",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RawCreateGasValueTransferMemory_d0g0v0_Homestead" : {
+    "RawCreateGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0x4d2c365b0c1a7cf1b62a96a78c170b294143e47e80fd7fe52155421273538cae",
-                    "mixHash" : "0x7c9dfb9d66d5641789ab2d9dc803e132bb131e786dcd0838756446076abbfde4",
-                    "nonce" : "0x8398179e17fc1c91",
+                    "hash" : "0xad4e0847c526949bdd8c9d2080748e77ad912f7a306decf17b34f2f56baa31cc",
+                    "mixHash" : "0x558f4c01416d91f1b913c8c64f2fc18758721228b3a8bc5b3140d3bef68852fb",
+                    "nonce" : "0x270bf52b6627713b",
                     "number" : "0x01",
                     "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
-                    "receiptTrie" : "0x31e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5",
-                    "stateRoot" : "0x2a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55",
+                    "receiptTrie" : "0xf6d3a6af474476f3f6da4eb8170739c5a7d13d5e8e15bb60745912cf7651c1c1",
+                    "stateRoot" : "0xc82ed6928d97a18ea4bc23cff4035475a001fdad598d922474e67d71e7d0244e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a07c9dfb9d66d5641789ab2d9dc803e132bb131e786dcd0838756446076abbfde4888398179e17fc1c91f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c82ed6928d97a18ea4bc23cff4035475a001fdad598d922474e67d71e7d0244ea01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0f6d3a6af474476f3f6da4eb8170739c5a7d13d5e8e15bb60745912cf7651c1c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0558f4c01416d91f1b913c8c64f2fc18758721228b3a8bc5b3140d3bef68852fb88270bf52b6627713bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d2c365b0c1a7cf1b62a96a78c170b294143e47e80fd7fe52155421273538cae",
-        "network" : "Homestead",
+        "lastblockhash" : "0xad4e0847c526949bdd8c9d2080748e77ad912f7a306decf17b34f2f56baa31cc",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
@@ -433,7 +447,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RawCreateGasValueTransferMemory_d0g0v0_Metropolis" : {
+    "RawCreateGasValueTransferMemory_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -470,18 +484,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ec5",
-                    "hash" : "0xb8bc05040ea5889494140275ff9e51a5ef27794a275a318a419086d0c6a17d30",
-                    "mixHash" : "0xdb2461f4e779e641025dc8180a9808908a1d5f40d725e965e0c5d73ba1ee0023",
-                    "nonce" : "0x0a668dc730e7c23c",
+                    "hash" : "0x79686714b33c3644d6b96ec53dc33fafb79659288f4f639d72bc772c13aae592",
+                    "mixHash" : "0x544b833c9eb030b88ce40fe81ba9f58e374d1621827bc35a44ce18e863681a2d",
+                    "nonce" : "0x368ecc9b13c919f7",
                     "number" : "0x01",
                     "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
-                    "receiptTrie" : "0x40208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94",
-                    "stateRoot" : "0x020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917",
+                    "receiptTrie" : "0x31e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5",
+                    "stateRoot" : "0x2a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020f850196ce714a442dad2e353a3b6e8c8e3b09892cba6c26542cbd0bf9b917a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a040208a26e9ff7a835907ffe0d46cec15fbe59b612a14996e96204ea807ba5d94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0db2461f4e779e641025dc8180a9808908a1d5f40d725e965e0c5d73ba1ee0023880a668dc730e7c23cf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0544b833c9eb030b88ce40fe81ba9f58e374d1621827bc35a44ce18e863681a2d88368ecc9b13c919f7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +532,123 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8bc05040ea5889494140275ff9e51a5ef27794a275a318a419086d0c6a17d30",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x79686714b33c3644d6b96ec53dc33fafb79659288f4f639d72bc772c13aae592",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56ec5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a131",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600055611f406000600af0505a600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06807e"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000600af0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateGasValueTransferMemory_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016ec5",
+                    "hash" : "0xef97dabb703a82d7f41a991ef5bcf2183f6b1f0376d28639973bb2d6bbe467ec",
+                    "mixHash" : "0x228b919a527fbcce745aeddd0727f000b1c000d733bd1ad95cab179ba5304a13",
+                    "nonce" : "0x4ac972ce9c282d20",
+                    "number" : "0x01",
+                    "parentHash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
+                    "receiptTrie" : "0x31e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5",
+                    "stateRoot" : "0x2a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a1ef021da526e9b3040fa1a5b7ab408ff995b3b435856b3eafca9cc9a9a0e55a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a031e1fc15eaeb5fa3662e7cc6c362b870490ef8ea3d699d15465b78a6bcfbe5a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016ec58203e880a0228b919a527fbcce745aeddd0727f000b1c000d733bd1ad95cab179ba5304a13884ac972ce9c282d20f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x628a1ea53660889462504f72fb42f323306294a472f61ef8ca29d83634469a76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06775d90495c48a20e8647304ec4213413ca0119dfb306c8c6c63bfa3dd2fa809a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xef97dabb703a82d7f41a991ef5bcf2183f6b1f0376d28639973bb2d6bbe467ec",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56ec5",
                 "code" : "",
@@ -554,7 +675,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0.json
index 6de5e3923..1a53c929b 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateGasValueTransfer_d0g0v0_EIP150" : {
+    "RawCreateGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x4acb824bfbfcbd58a5a22c60a892657c947379489f4262171b356f65bcf24b4e",
-                    "mixHash" : "0x4067810c2d1326649f61ba68e748453bbe28b6d3b8aa8b49eb1ff37faf4e9ba0",
-                    "nonce" : "0x5dbc565edd1ac5c1",
+                    "hash" : "0x69f26532dc0c710791df15863a2172fa121401ca2883e66e223311e0acdd4c42",
+                    "mixHash" : "0xc165950587b2a97dbcbaf9a12793ec45c98a606175bb37b66ca84c6379340d5f",
+                    "nonce" : "0xa465aed4e16caf4e",
                     "number" : "0x01",
                     "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
-                    "receiptTrie" : "0x5cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2",
-                    "stateRoot" : "0x18767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0xe581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a04067810c2d1326649f61ba68e748453bbe28b6d3b8aa8b49eb1ff37faf4e9ba0885dbc565edd1ac5c1f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0c165950587b2a97dbcbaf9a12793ec45c98a606175bb37b66ca84c6379340d5f88a465aed4e16caf4ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4acb824bfbfcbd58a5a22c60a892657c947379489f4262171b356f65bcf24b4e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x69f26532dc0c710791df15863a2172fa121401ca2883e66e223311e0acdd4c42",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -91,7 +98,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RawCreateGasValueTransfer_d0g0v0_EIP158" : {
+    "RawCreateGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x5ddd455d66812db2818526948aca5a8e34455cda00afd1c4be96e1941e2146b6",
-                    "mixHash" : "0x9645896e19b83ad5fc6a81eb9e2a0026faafee8668b03a9f97530790662c7a1a",
-                    "nonce" : "0x5c95adfbed0a7cda",
+                    "hash" : "0x16e0b3a8fbf922451c4fb2aec3cdcf0adf9e25e8bcb206f76a9814404831c27d",
+                    "mixHash" : "0xf41e993a0741987e685b11bf5a0e26504b0ea11b89b672ef6817b6f9eb0226d5",
+                    "nonce" : "0x84d926fd9a48937d",
                     "number" : "0x01",
                     "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
-                    "receiptTrie" : "0xe0c60ac272e7913b26e0e6e241a8dc401e8db05b82de6f87dae7ad92e5cdb94c",
-                    "stateRoot" : "0x9c0faa4f92789246a81d19ab14b02cc788d638d9a602190916f82aaf8bff6e67",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0xe581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c0faa4f92789246a81d19ab14b02cc788d638d9a602190916f82aaf8bff6e67a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0e0c60ac272e7913b26e0e6e241a8dc401e8db05b82de6f87dae7ad92e5cdb94cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a09645896e19b83ad5fc6a81eb9e2a0026faafee8668b03a9f97530790662c7a1a885c95adfbed0a7cdaf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0f41e993a0741987e685b11bf5a0e26504b0ea11b89b672ef6817b6f9eb0226d58884d926fd9a48937df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ddd455d66812db2818526948aca5a8e34455cda00afd1c4be96e1941e2146b6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x16e0b3a8fbf922451c4fb2aec3cdcf0adf9e25e8bcb206f76a9814404831c27d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RawCreateGasValueTransfer_d0g0v0_Frontier" : {
+    "RawCreateGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +256,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x36b7399725ade5d756e00e1f681adfc528b1e368c3abc7070edaf43c64d67af9",
-                    "mixHash" : "0x3ff3a5013d40914800ba33f7ecb790cdf7f310dba0e5d0a61f4dfae912c44134",
-                    "nonce" : "0x9fae6e117ee564d4",
+                    "hash" : "0x2fffc53325e76a001d740656e307063e9015e429ddc5cfcdd37958742b1e9ba7",
+                    "mixHash" : "0x6a3d9bbb9e053cd20fbc01114c98a420709a40059d29c02d05b8d6f7956985b7",
+                    "nonce" : "0x911a7fa9c64fc067",
                     "number" : "0x01",
                     "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
                     "receiptTrie" : "0x5cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2",
@@ -253,7 +267,7 @@
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a03ff3a5013d40914800ba33f7ecb790cdf7f310dba0e5d0a61f4dfae912c44134889fae6e117ee564d4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a06a3d9bbb9e053cd20fbc01114c98a420709a40059d29c02d05b8d6f7956985b788911a7fa9c64fc067f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36b7399725ade5d756e00e1f681adfc528b1e368c3abc7070edaf43c64d67af9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2fffc53325e76a001d740656e307063e9015e429ddc5cfcdd37958742b1e9ba7",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RawCreateGasValueTransfer_d0g0v0_Homestead" : {
+    "RawCreateGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xfc7f0f6dfb2788fae851cb18bbe7d58e0662b6f394d5529e188a6ebd38ebd422",
-                    "mixHash" : "0x9305ebcfda10aa0e091c088cff8b720ba80e9c0e4f8da279bd43ddf750a01a1e",
-                    "nonce" : "0x646c2a8c21dcf6d6",
+                    "hash" : "0xddb5a5be6a9c41b6a3b976b640f478b3f31b07bee9d2cb383684a69e8a53463d",
+                    "mixHash" : "0xd8a8368493a0e8892e01d8d319eb5c4af4b72864bf1ebee0a225c6288360b18a",
+                    "nonce" : "0xc76ee140490ab380",
                     "number" : "0x01",
                     "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
-                    "receiptTrie" : "0x5cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2",
-                    "stateRoot" : "0x18767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3",
+                    "receiptTrie" : "0xe0c60ac272e7913b26e0e6e241a8dc401e8db05b82de6f87dae7ad92e5cdb94c",
+                    "stateRoot" : "0x9c0faa4f92789246a81d19ab14b02cc788d638d9a602190916f82aaf8bff6e67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a09305ebcfda10aa0e091c088cff8b720ba80e9c0e4f8da279bd43ddf750a01a1e88646c2a8c21dcf6d6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c0faa4f92789246a81d19ab14b02cc788d638d9a602190916f82aaf8bff6e67a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0e0c60ac272e7913b26e0e6e241a8dc401e8db05b82de6f87dae7ad92e5cdb94cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0d8a8368493a0e8892e01d8d319eb5c4af4b72864bf1ebee0a225c6288360b18a88c76ee140490ab380f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc7f0f6dfb2788fae851cb18bbe7d58e0662b6f394d5529e188a6ebd38ebd422",
-        "network" : "Homestead",
+        "lastblockhash" : "0xddb5a5be6a9c41b6a3b976b640f478b3f31b07bee9d2cb383684a69e8a53463d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -433,7 +447,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RawCreateGasValueTransfer_d0g0v0_Metropolis" : {
+    "RawCreateGasValueTransfer_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/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -470,18 +484,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x245ef6f5fdb3275d63a9eb4b5e3396a773da000017f993a4d53ad16a2af51a0e",
-                    "mixHash" : "0x8c364ca512da0a7229840aaf1fbd01c3aaaed3dd8442ffdc72e660751c15e6aa",
-                    "nonce" : "0x31289d9a20702f46",
+                    "hash" : "0x52603684a6d71e5ec3dca2d90779f6edc76d5b84da4c292b55467593236d1de9",
+                    "mixHash" : "0xe908b81af4474a2f4e7105cb7fe1091be5d6d7a2141e122b0616f91a0447651b",
+                    "nonce" : "0xafb838d0a7a4f1a0",
                     "number" : "0x01",
                     "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0xe581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430",
+                    "receiptTrie" : "0x5cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2",
+                    "stateRoot" : "0x18767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e581e75de57e1f1efa4a6bddfb77ffc89b8d815b290af5ab33274d39cdab0430a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08c364ca512da0a7229840aaf1fbd01c3aaaed3dd8442ffdc72e660751c15e6aa8831289d9a20702f46f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0e908b81af4474a2f4e7105cb7fe1091be5d6d7a2141e122b0616f91a0447651b88afb838d0a7a4f1a0f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +532,123 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x245ef6f5fdb3275d63a9eb4b5e3396a773da000017f993a4d53ad16a2af51a0e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x52603684a6d71e5ec3dca2d90779f6edc76d5b84da4c292b55467593236d1de9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a499",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a60005560006000600af0505a600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0683e6"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005560006000600af0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateGasValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0x0665ba7001d45acc655005c08928b54e23ec1fe4d207ef968959a300f70f1a72",
+                    "mixHash" : "0xc81bcd3513ed283d7fb4abdacc8f2c5a0f2bd4b76518023c9911d1da54a687ae",
+                    "nonce" : "0xd96a255a81ff76d8",
+                    "number" : "0x01",
+                    "parentHash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
+                    "receiptTrie" : "0x5cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2",
+                    "stateRoot" : "0x18767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a021f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018767092d1c6fb4d32029ff26ac4152682136e8a10c51c44d273057418c961f3a01384d4af33ac6b019131e808ca5f18a8845fa6b185c9939f71fe44c7fd34e468a05cef021311c7aa9be6a31c61d70ee221583589caa9356f68785888268468e1c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0c81bcd3513ed283d7fb4abdacc8f2c5a0f2bd4b76518023c9911d1da54a687ae88d96a255a81ff76d8f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0b1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81ea04a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1159810e8fb83901e6b2cfb738fcb6e551c98aa64736c6330fbc349de7cb81e",
+                        "s" : "0x4a8eadc208134504d2abb1b5845f8b6bcafb3fd9cc53bd055f10c68a42ecd24b",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x21f2f02228a973f4908ce2c78fd0564b4aedf8f5d7b4aa52bf94d0f49392f499",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9dbf7b1b64ebc40a2aa3ffb949220de46f2bef846d9b9b35e9853833e82309fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0665ba7001d45acc655005c08928b54e23ec1fe4d207ef968959a300f70f1a72",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -554,7 +675,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x0a",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
index 914c16296..2169e5a99 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateGas_d0g0v0_EIP150" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xd2163753a2fdecb5796912771dc0d332171b005dc412d266394a0fbe55d1ed73",
-                    "mixHash" : "0x34da71c4076a1a1ff29700db7febc731be499b7f6f71c8439837f1a6d8b69491",
-                    "nonce" : "0x8350deaa89c7d21b",
+                    "hash" : "0x4d73cb8779b1bca51f7bb8709308ee2552ab2db8d2567dc931fcfc23bc6e0817",
+                    "mixHash" : "0x993d18fa0f8518216c86dad74b207f7f7957274f40e0f2fb9f357d00ec155824",
+                    "nonce" : "0x5012109f03380708",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
-                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a034da71c4076a1a1ff29700db7febc731be499b7f6f71c8439837f1a6d8b69491888350deaa89c7d21bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0993d18fa0f8518216c86dad74b207f7f7957274f40e0f2fb9f357d00ec155824885012109f03380708f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2163753a2fdecb5796912771dc0d332171b005dc412d266394a0fbe55d1ed73",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4d73cb8779b1bca51f7bb8709308ee2552ab2db8d2567dc931fcfc23bc6e0817",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -91,7 +98,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_EIP158" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x07c62e7b7b19952e6ab1580ba351717a7fbadb68e376f9724a7e2bbfe8eeeed9",
-                    "mixHash" : "0x3608b4dc6b0b4df6088a110ea1051e7f4f3dcb5fde55892d7e07e2be10723d4b",
-                    "nonce" : "0x09597e5892a3707d",
+                    "hash" : "0xe9d2371464dc3717d3b0d8fbfa07c6d8db014a8669eeaf9283723602bf96e76a",
+                    "mixHash" : "0xb4635abf7a10db86ea24a36e341a3eae8ccf20fee0bb21ed0d91a949a1589a26",
+                    "nonce" : "0x801d39363e671c94",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x5f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658",
-                    "stateRoot" : "0x0ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da05f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a03608b4dc6b0b4df6088a110ea1051e7f4f3dcb5fde55892d7e07e2be10723d4b8809597e5892a3707df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0b4635abf7a10db86ea24a36e341a3eae8ccf20fee0bb21ed0d91a949a1589a2688801d39363e671c94f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07c62e7b7b19952e6ab1580ba351717a7fbadb68e376f9724a7e2bbfe8eeeed9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe9d2371464dc3717d3b0d8fbfa07c6d8db014a8669eeaf9283723602bf96e76a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Frontier" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +256,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x27e129269573409b1ece32d1ab86c005191a546b01468df1c753540f1ad77a33",
-                    "mixHash" : "0x2fd40eef5664bff7800d1e93984985b0052dde25a3f094bddf9d2c17fa020b6a",
-                    "nonce" : "0x74470201ac8c9602",
+                    "hash" : "0xebba74f25890baa0749377f9396d84c5e0fc77da17cddbc568ef19ffa11daec1",
+                    "mixHash" : "0x8caff0492cc0206dec7db35d64fba208186473a7f907a0cba21c97237833b775",
+                    "nonce" : "0x2abd62ff9a119238",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
                     "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
@@ -253,7 +267,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a02fd40eef5664bff7800d1e93984985b0052dde25a3f094bddf9d2c17fa020b6a8874470201ac8c9602f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08caff0492cc0206dec7db35d64fba208186473a7f907a0cba21c97237833b775882abd62ff9a119238f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27e129269573409b1ece32d1ab86c005191a546b01468df1c753540f1ad77a33",
-        "network" : "Frontier",
+        "lastblockhash" : "0xebba74f25890baa0749377f9396d84c5e0fc77da17cddbc568ef19ffa11daec1",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Homestead" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xa7d7da512392947efc9c261a46e556d51dd04ee49fa036af9b62b786a06131bd",
-                    "mixHash" : "0x2d77cdc551ce7583491ae3ebf80deb7b0527c0b48c087dcfbdcd9b80f1cb1d73",
-                    "nonce" : "0x4f43fd91ce29d0ec",
+                    "hash" : "0x66b84ffe6d59fead4d7255603ed4050be2af7f40a4fa81d98dd19c0c65671d63",
+                    "mixHash" : "0x5aa36f4053d8b6ce726679559dfe4ce5bc526e2614dc1e8db03ea3305fc8a5b9",
+                    "nonce" : "0xaf4a48bf591a39ac",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
-                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "receiptTrie" : "0x5f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658",
+                    "stateRoot" : "0x0ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a02d77cdc551ce7583491ae3ebf80deb7b0527c0b48c087dcfbdcd9b80f1cb1d73884f43fd91ce29d0ecf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da05f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a05aa36f4053d8b6ce726679559dfe4ce5bc526e2614dc1e8db03ea3305fc8a5b988af4a48bf591a39acf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7d7da512392947efc9c261a46e556d51dd04ee49fa036af9b62b786a06131bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x66b84ffe6d59fead4d7255603ed4050be2af7f40a4fa81d98dd19c0c65671d63",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -433,7 +447,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Metropolis" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -470,18 +484,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x70d601af698651d388ad81cd50497debb3124f5bee417f9e14dc7d132b4c2626",
-                    "mixHash" : "0xc447b687781af85bf62ca414ccaa6d6ccda16e810c610919f06d4d20bf6cd235",
-                    "nonce" : "0x8003f1b8e562cfb6",
+                    "hash" : "0x3f1c1b6f7da532b526adb1e1bd5a55eb409e62f71649b22d4859bdf2c1516b5d",
+                    "mixHash" : "0xa36728b13fc85d99763af5e3a51216fb85e3f33df307964800efdc0b7dc8ff85",
+                    "nonce" : "0x1e811a8ac2551f2b",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
+                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
+                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0c447b687781af85bf62ca414ccaa6d6ccda16e810c610919f06d4d20bf6cd235888003f1b8e562cfb6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0a36728b13fc85d99763af5e3a51216fb85e3f33df307964800efdc0b7dc8ff85881e811a8ac2551f2bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +532,123 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70d601af698651d388ad81cd50497debb3124f5bee417f9e14dc7d132b4c2626",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3f1c1b6f7da532b526adb1e1bd5a55eb409e62f71649b22d4859bdf2c1516b5d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4a3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000f0505a600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0683e6"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000f0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0x1df3392f60ec793596ff62dfd5489b318200333d0d997c8f17e207b66b63bf30",
+                    "mixHash" : "0x70a47129833ba047a67d78414b7232a8404e6821e3c924d135288329f15ad569",
+                    "nonce" : "0xe294a9768c0657cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
+                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
+                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a070a47129833ba047a67d78414b7232a8404e6821e3c924d135288329f15ad56988e294a9768c0657cdf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1df3392f60ec793596ff62dfd5489b318200333d0d997c8f17e207b66b63bf30",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -554,7 +675,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0.json
index db38d32a1..e58fe659f 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawDelegateCallGasAsk_d0g0v0_EIP150" : {
+    "RawDelegateCallGasAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f47",
-                    "hash" : "0x60f84723e291613e58be4049da072f0e087494341ea515124c57eed42f8912d7",
-                    "mixHash" : "0xd319559c5c791d6e343e64a9b5560b4580d26c7337f54d8d5dc570ce809cf04b",
-                    "nonce" : "0x4732809a7bd0696e",
+                    "hash" : "0xa7d20dbc1cb2cc86b0cc173c581ae708161ca0ccc5b068925523ec6272730092",
+                    "mixHash" : "0xfb93f35fd7419b6a8c67588b5da1c3ae26407221d6115cae8bec8cbfe64a9321",
+                    "nonce" : "0x11d9fc2de51003ef",
                     "number" : "0x01",
                     "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
-                    "receiptTrie" : "0xccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47",
-                    "stateRoot" : "0x833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6",
+                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
+                    "stateRoot" : "0x9a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0d319559c5c791d6e343e64a9b5560b4580d26c7337f54d8d5dc570ce809cf04b884732809a7bd0696ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0fb93f35fd7419b6a8c67588b5da1c3ae26407221d6115cae8bec8cbfe64a93218811d9fc2de51003eff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60f84723e291613e58be4049da072f0e087494341ea515124c57eed42f8912d7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa7d20dbc1cb2cc86b0cc173c581ae708161ca0ccc5b068925523ec6272730092",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawDelegateCallGasAsk_d0g0v0_EIP158" : {
+    "RawDelegateCallGasAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f47",
-                    "hash" : "0xc03ba733c60a899d3312208ec1f8157ac6b28e54c7e2718a856f05dddcfebf5b",
-                    "mixHash" : "0xf5420aceb6577ce38bd89768cb5d2e50e81cdeccd0e60ebd4d6b518b5af5b4ab",
-                    "nonce" : "0xc68bd75192424c13",
+                    "hash" : "0xae0f586e50529321f086d390d6879728a7b6673cb787364ab16160606c9d9050",
+                    "mixHash" : "0x88caeea33bf99e39c671f736e0d052490cded03bddd282231530e814c6631944",
+                    "nonce" : "0xdd3f2c5842f8a2dd",
+                    "number" : "0x01",
+                    "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
+                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
+                    "stateRoot" : "0x9a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a088caeea33bf99e39c671f736e0d052490cded03bddd282231530e814c663194488dd3f2c5842f8a2ddf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xae0f586e50529321f086d390d6879728a7b6673cb787364ab16160606c9d9050",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f47",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06affc",
+                    "0x02" : "0x06e22b"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawDelegateCallGasAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f47",
+                    "hash" : "0x9e1a4cb8f91f010b7fce119239147a8dcdf24b1a25ad804088e0155c8b7217c4",
+                    "mixHash" : "0xa71738caa7a40a25fcd5bc46a0658145855472841733bf05fd62b02cf4c51bf6",
+                    "nonce" : "0xf9be135d4f993d35",
                     "number" : "0x01",
                     "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
                     "receiptTrie" : "0xccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0f5420aceb6577ce38bd89768cb5d2e50e81cdeccd0e60ebd4d6b518b5af5b4ab88c68bd75192424c13f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0a71738caa7a40a25fcd5bc46a0658145855472841733bf05fd62b02cf4c51bf688f9be135d4f993d35f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc03ba733c60a899d3312208ec1f8157ac6b28e54c7e2718a856f05dddcfebf5b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9e1a4cb8f91f010b7fce119239147a8dcdf24b1a25ad804088e0155c8b7217c4",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawDelegateCallGasAsk_d0g0v0_Frontier" : {
+    "RawDelegateCallGasAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0x39e62a244a1d5e7de024adf91d4808f60ab1fb86a51b166cebe9964de188d7ab",
-                    "mixHash" : "0x013ede5624250fd71d82f34b8b27aee53fdc9138c50d93597fd5c49c9b2cc6f2",
-                    "nonce" : "0xb71a63b7b0f9ba30",
+                    "gasUsed" : "0x013f47",
+                    "hash" : "0xc08e67e8cc80481d50ff4ed758f1e2e1742eea8e42807c1625d480437f6340fd",
+                    "mixHash" : "0x47cef4eb3563b370a5b27a0b87a32ea87862e1ae61c51308bd244c4c7fff9c10",
+                    "nonce" : "0x8840a91f4414a1d7",
                     "number" : "0x01",
                     "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
-                    "receiptTrie" : "0x261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672",
-                    "stateRoot" : "0x776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9c",
+                    "receiptTrie" : "0xccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47",
+                    "stateRoot" : "0x833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0013ede5624250fd71d82f34b8b27aee53fdc9138c50d93597fd5c49c9b2cc6f288b71a63b7b0f9ba30f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0833948b9850522d6d732a41a1273e00f7631ae67dfc4d70db76ab1876003efc6a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ccd2dc9db0d81f703f2a8623219eb54adf5ddf2a873de79b545d2304f33d1a47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a047cef4eb3563b370a5b27a0b87a32ea87862e1ae61c51308bd244c4c7fff9c10888840a91f4414a1d7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39e62a244a1d5e7de024adf91d4808f60ab1fb86a51b166cebe9964de188d7ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc08e67e8cc80481d50ff4ed758f1e2e1742eea8e42807c1625d480437f6340fd",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f53f47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3d0b9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06affc",
+                    "0x02" : "0x06e22b"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawDelegateCallGasAsk_d0g0v0_Homestead" : {
+    "RawDelegateCallGasAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xd0dc941fd722c2c91ef79ff91869109ed342d2b9be6e55616ffd0f28ada28fcf",
-                    "mixHash" : "0x6e7fe9556ab8b995245cd42b64d857be806ec1e435b69c0d63aaf2cce37e9b35",
-                    "nonce" : "0x0b909471f285a50f",
+                    "hash" : "0xfd2db4a316c70b1464fe99a97cf476a32c2a667281ccf0f4235ff797b61fd959",
+                    "mixHash" : "0x19c019d23b6e855da8dca276ef22056d751a0a96e597eae31572c71e38a3b555",
+                    "nonce" : "0x0b268b01fd236676",
                     "number" : "0x01",
                     "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
                     "receiptTrie" : "0x261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a06e7fe9556ab8b995245cd42b64d857be806ec1e435b69c0d63aaf2cce37e9b35880b909471f285a50ff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a019c019d23b6e855da8dca276ef22056d751a0a96e597eae31572c71e38a3b555880b268b01fd236676f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0dc941fd722c2c91ef79ff91869109ed342d2b9be6e55616ffd0f28ada28fcf",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfd2db4a316c70b1464fe99a97cf476a32c2a667281ccf0f4235ff797b61fd959",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawDelegateCallGasAsk_d0g0v0_Metropolis" : {
+    "RawDelegateCallGasAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f47",
-                    "hash" : "0xa2d748bc7bcb96cbe57a27b65629237035c0d895aaf48953609eabc7804798eb",
-                    "mixHash" : "0xf1189d9065df983257ec412cca6491833c64939fea1e2d44e1bdc1f337dc779b",
-                    "nonce" : "0x452b54fcf14e1235",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0xb2b2875986f9ec44f1ab50696736d614f74445fe0c6725052cf24e1f4a9f471d",
+                    "mixHash" : "0x91643ba41960b7e541a28929decae1e1abba980d41885cf909c9063c9bb24cd6",
+                    "nonce" : "0xbb48058294d0bc7b",
                     "number" : "0x01",
                     "parentHash" : "0xc6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4",
-                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
-                    "stateRoot" : "0x9a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171a",
+                    "receiptTrie" : "0x261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672",
+                    "stateRoot" : "0x776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a519652ec93bbe0389d14738339a3081f1288d7aedda946b5ba17b2f35e171aa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0f1189d9065df983257ec412cca6491833c64939fea1e2d44e1bdc1f337dc779b88452b54fcf14e1235f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a0c6a49ad08f68b28cb8271a1f3d2a2b9767fb131f13fe324339b54913268637a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0776626179f0b7058cdad0a74a94d5412377c371e377a3aff2c3c95db26017e9ca0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0261b9ba03ce8056c8b83babda63a8e35a3b1be8c8acde3af5887c7ad93432672b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a091643ba41960b7e541a28929decae1e1abba980d41885cf909c9063c9bb24cd688bb48058294d0bc7bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc60488aafddee776436350b5c59256ec923032637d819bb054f1d46786079a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2d748bc7bcb96cbe57a27b65629237035c0d895aaf48953609eabc7804798eb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb2b2875986f9ec44f1ab50696736d614f74445fe0c6725052cf24e1f4a9f471d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f47",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b9",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06affc",
-                    "0x02" : "0x06e22b"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0.json
index 3677bf3da..6244d3456 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawDelegateCallGasMemoryAsk_d0g0v0_EIP150" : {
+    "RawDelegateCallGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142af",
-                    "hash" : "0x553b08081a933892a8360f78605942a42b4ec71600001885bf5a1cc5e8a00390",
-                    "mixHash" : "0x9ef879663a1751c55b4033ff0ec45249bc075555424dcb67289b002808832d36",
-                    "nonce" : "0x6372c002a7b01fb9",
+                    "hash" : "0xe87cabaef24463d4c738a7e4fee97dc726e8e73f619a5b7200902b780ec2cd4e",
+                    "mixHash" : "0xf5927cb3f003444ed58d254c9f182f64ef0187e44d9839fc6a0f7daf9eb04f10",
+                    "nonce" : "0x9d07033576b08282",
                     "number" : "0x01",
                     "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
-                    "receiptTrie" : "0xec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292",
-                    "stateRoot" : "0xace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370",
+                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
+                    "stateRoot" : "0xd46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a09ef879663a1751c55b4033ff0ec45249bc075555424dcb67289b002808832d36886372c002a7b01fb9f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0f5927cb3f003444ed58d254c9f182f64ef0187e44d9839fc6a0f7daf9eb04f10889d07033576b08282f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x553b08081a933892a8360f78605942a42b4ec71600001885bf5a1cc5e8a00390",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe87cabaef24463d4c738a7e4fee97dc726e8e73f619a5b7200902b780ec2cd4e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemoryAsk_d0g0v0_EIP158" : {
+    "RawDelegateCallGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142af",
-                    "hash" : "0x2835c5cea26bec3f76cbd66d8610e019f8390a45a8b85670ea62a6f1c4f18901",
-                    "mixHash" : "0x60428603011d5f0c6c0e2930ed9a0a198259999d980ea98cb820ed66da8f5321",
-                    "nonce" : "0x0e3b255f51853253",
+                    "hash" : "0x0eb1765bff65dd3ecfa9a353fa80923174b3bc32d0cb7f4c7d66c87a9d15384e",
+                    "mixHash" : "0xffca2472b1218c4b6c2b786c43814e38202e78012d9cf8f00c020a81ec13b0db",
+                    "nonce" : "0xf0da7513e7aba45d",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
+                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
+                    "stateRoot" : "0xd46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9ea",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0ffca2472b1218c4b6c2b786c43814e38202e78012d9cf8f00c020a81ec13b0db88f0da7513e7aba45df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0eb1765bff65dd3ecfa9a353fa80923174b3bc32d0cb7f4c7d66c87a9d15384e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f542af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3cd51",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac94",
+                    "0x02" : "0x06ded1"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawDelegateCallGasMemoryAsk_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0142af",
+                    "hash" : "0x0a370b6a69a5b98839b3fb66b4e17cb0640ea0e5f3f4199809ddff98831ecff5",
+                    "mixHash" : "0xc435c5d7c7092e8fd6bdda6184182260f148359b3a372ffba67ac670c7e3b009",
+                    "nonce" : "0x815a91966f26dd9b",
                     "number" : "0x01",
                     "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
                     "receiptTrie" : "0xec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a060428603011d5f0c6c0e2930ed9a0a198259999d980ea98cb820ed66da8f5321880e3b255f51853253f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0c435c5d7c7092e8fd6bdda6184182260f148359b3a372ffba67ac670c7e3b00988815a91966f26dd9bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2835c5cea26bec3f76cbd66d8610e019f8390a45a8b85670ea62a6f1c4f18901",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0a370b6a69a5b98839b3fb66b4e17cb0640ea0e5f3f4199809ddff98831ecff5",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemoryAsk_d0g0v0_Frontier" : {
+    "RawDelegateCallGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xb960dfe4f3e716b95a38af8732631335b3ec3e38dcec13d3ecb58b23b1c0191b",
-                    "mixHash" : "0x9f60196ae4a65ee90e05c2ca619b277dcb26ce31409983604438726d85dd0162",
-                    "nonce" : "0x82ac8de1fd4bc603",
+                    "gasUsed" : "0x0142af",
+                    "hash" : "0xfb91637a2c1b28cdd8f34f0ecf0764dc49fc52d01f14d21c0d6c4c49f0f40c4b",
+                    "mixHash" : "0x10d64fd3e3a83b55a8df466076074f75e9c0f1aae902b79fc392a5eefb0a7ec1",
+                    "nonce" : "0x1016347e84836694",
                     "number" : "0x01",
                     "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
-                    "receiptTrie" : "0x72fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8",
-                    "stateRoot" : "0x79de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbad",
+                    "receiptTrie" : "0xec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292",
+                    "stateRoot" : "0xace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbada0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da072fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a09f60196ae4a65ee90e05c2ca619b277dcb26ce31409983604438726d85dd01628882ac8de1fd4bc603f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace02451aee495a2bed69aca945ebf3ab8887d72ef022b8cbe9ae80d059b8370a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0ec4733d6ebb1b51f952bca99f4d2e2bb6bef979f9aeb69874242d12ed54b3292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a010d64fd3e3a83b55a8df466076074f75e9c0f1aae902b79fc392a5eefb0a7ec1881016347e84836694f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb960dfe4f3e716b95a38af8732631335b3ec3e38dcec13d3ecb58b23b1c0191b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfb91637a2c1b28cdd8f34f0ecf0764dc49fc52d01f14d21c0d6c4c49f0f40c4b",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f542af",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3cd51",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac94",
+                    "0x02" : "0x06ded1"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemoryAsk_d0g0v0_Homestead" : {
+    "RawDelegateCallGasMemoryAsk_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07a120",
-                    "hash" : "0xb86ee1e39121523bf2e1d692fef4c2d00ce4338c6f20bae08f81394ea510d0a5",
-                    "mixHash" : "0xa4e797ac4c964a0583009bbb107ef8ab74879f28d6dbd36aace1ca330bd0b799",
-                    "nonce" : "0xc87ba859e741fe65",
+                    "hash" : "0x275d02c8f3efccc044eaef799ffa14b3afe0120222185ddf9e6036ee3e378406",
+                    "mixHash" : "0x528e3904ce1f7cc85826b1bf75c09287d2e23dd3a6e06d626f21cf4cd35aa8d0",
+                    "nonce" : "0x37b9d4a821684865",
                     "number" : "0x01",
                     "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
                     "receiptTrie" : "0x72fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbada0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da072fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0a4e797ac4c964a0583009bbb107ef8ab74879f28d6dbd36aace1ca330bd0b79988c87ba859e741fe65f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbada0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da072fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0528e3904ce1f7cc85826b1bf75c09287d2e23dd3a6e06d626f21cf4cd35aa8d08837b9d4a821684865f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb86ee1e39121523bf2e1d692fef4c2d00ce4338c6f20bae08f81394ea510d0a5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x275d02c8f3efccc044eaef799ffa14b3afe0120222185ddf9e6036ee3e378406",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemoryAsk_d0g0v0_Metropolis" : {
+    "RawDelegateCallGasMemoryAsk_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142af",
-                    "hash" : "0xc93532cca784aa092f56766416a0233cb69e2a665144277c568e3b62b753f318",
-                    "mixHash" : "0x0ce33dec03f8151a3520aa5451c11d2cf4312a5f39ec0c4daad323a4abdff640",
-                    "nonce" : "0xc473b66f0812dbd4",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x98fb0db95d29bb0b6797412fc52ac596c037a6890a917e55ae7c2ed77aa8b1fb",
+                    "mixHash" : "0x45dcc693c317236c027e61abdcaa3e96764442b8fd5d206a0bccaddf1d05aa36",
+                    "nonce" : "0x6b517eb87e5f68f7",
                     "number" : "0x01",
                     "parentHash" : "0x1b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3",
-                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
-                    "stateRoot" : "0xd46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9ea",
+                    "receiptTrie" : "0x72fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8",
+                    "stateRoot" : "0x79de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46e0061f7c8e9e87c4896fe3a91698fdcd29aff2925516cb54952f0a2c4b9eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a00ce33dec03f8151a3520aa5451c11d2cf4312a5f39ec0c4daad323a4abdff64088c473b66f0812dbd4f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a01b6bce97cd4a5781f4484ddcd607ca85b7c7a15d8b39989005c187e922e1dbe3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079de1b368d66c825924da454c7c6c03ec13cc92e271aebf79edc8e84c943cbada0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da072fa42bbd3f23acfd76b39444d7f3e36395caf898babe805b75676871ca454f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a045dcc693c317236c027e61abdcaa3e96764442b8fd5d206a0bccaddf1d05aa36886b517eb87e5f68f7f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07716deba71cf1daa98479127da855c20d3b710d355bcc94e1e46cc3e1fbea2d3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc93532cca784aa092f56766416a0233cb69e2a665144277c568e3b62b753f318",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x98fb0db95d29bb0b6797412fc52ac596c037a6890a917e55ae7c2ed77aa8b1fb",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542af",
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd51",
+                "balance" : "0xe8d49d6ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x074f16",
-                    "0x01" : "0x06ac94",
-                    "0x02" : "0x06ded1"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0.json
index e4157f69a..738cf8b97 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawDelegateCallGasMemory_d0g0v0_EIP150" : {
+    "RawDelegateCallGasMemory_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142af",
-                    "hash" : "0x05a7131ab846e28ed4ee2f7a11040de10209441ef789e9355c7da19b29dc0d9d",
-                    "mixHash" : "0x4ef6a22c55baf115df9c8c474de3b0e60ecaa67018738f01170b9d0af3ab6471",
-                    "nonce" : "0xaa257f4137e79ca0",
+                    "hash" : "0x52592e3d63f6c4dacdba6505912dfbaa36a4382e619ea0e9c5eb35d94c2a6dfa",
+                    "mixHash" : "0x3a6d2f7ac4137c0c4acc48402e53a0edc2b79ad0446b7ceea0f7f6529edc2cd9",
+                    "nonce" : "0x7ce230a7af90327e",
                     "number" : "0x01",
                     "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
-                    "receiptTrie" : "0x8c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00",
-                    "stateRoot" : "0x68687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5",
+                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
+                    "stateRoot" : "0x2d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a04ef6a22c55baf115df9c8c474de3b0e60ecaa67018738f01170b9d0af3ab647188aa257f4137e79ca0f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a03a6d2f7ac4137c0c4acc48402e53a0edc2b79ad0446b7ceea0f7f6529edc2cd9887ce230a7af90327ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05a7131ab846e28ed4ee2f7a11040de10209441ef789e9355c7da19b29dc0d9d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x52592e3d63f6c4dacdba6505912dfbaa36a4382e619ea0e9c5eb35d94c2a6dfa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemory_d0g0v0_EIP158" : {
+    "RawDelegateCallGasMemory_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,18 +143,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0142af",
-                    "hash" : "0x6f2ee2405dd38eb90fa3e9ee726477be41b1984bd9b28c715d61bc917d32936c",
-                    "mixHash" : "0xaf777030d423f41a0ee401cc3ba28c74c2701606551750b5743e6706824b1a33",
-                    "nonce" : "0x4f7093a24fb0b9c6",
+                    "hash" : "0x7be91c503136b14e7c3a2080b6aac1ff4854b9d3d59a995ba7d6e48c4b3f51ee",
+                    "mixHash" : "0xccb7db32d1c63a95c60f99d5edbd59f1c4ef32fa796196730327b50813f7596f",
+                    "nonce" : "0xcb270de844b5e0ff",
                     "number" : "0x01",
                     "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
-                    "receiptTrie" : "0x8c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00",
-                    "stateRoot" : "0x68687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5",
+                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
+                    "stateRoot" : "0x2d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0af777030d423f41a0ee401cc3ba28c74c2701606551750b5743e6706824b1a33884f7093a24fb0b9c6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0ccb7db32d1c63a95c60f99d5edbd59f1c4ef32fa796196730327b50813f7596f88cb270de844b5e0fff862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,9 +191,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f2ee2405dd38eb90fa3e9ee726477be41b1984bd9b28c715d61bc917d32936c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7be91c503136b14e7c3a2080b6aac1ff4854b9d3d59a995ba7d6e48c4b3f51ee",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -243,10 +257,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemory_d0g0v0_Frontier" : {
+    "RawDelegateCallGasMemory_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +271,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0x4f9c17883f497a4915ee972ccc9c9cce9712c1a6b241610c4a04e77f34ff1444",
-                    "mixHash" : "0x4ca45dedb2dea43449f0b4a233069835c90b17d738a86425ac05df3157031a6c",
-                    "nonce" : "0x671e6264f6786c78",
+                    "gasUsed" : "0x0142af",
+                    "hash" : "0xa155a55b43520ce00a924527909d9eed13208c7bfb6927f3c08572d8862c02f7",
+                    "mixHash" : "0x5cb1ea1d69e0dc752038269545c305e151ec42591f004cc485ea03e344dc2fc1",
+                    "nonce" : "0xa2953a7b7197f650",
                     "number" : "0x01",
                     "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
-                    "receiptTrie" : "0x81490df1ffb77edd65dfbf951338abc884c7dcbfe4c13c36c692abd78dae100e",
-                    "stateRoot" : "0x2dfe4178ee764d53c4dd07ebe07304adc4a0cba3bf2b5b0e0685a7c758f29250",
+                    "receiptTrie" : "0x8c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00",
+                    "stateRoot" : "0x68687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dfe4178ee764d53c4dd07ebe07304adc4a0cba3bf2b5b0e0685a7c758f29250a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da081490df1ffb77edd65dfbf951338abc884c7dcbfe4c13c36c692abd78dae100eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a04ca45dedb2dea43449f0b4a233069835c90b17d738a86425ac05df3157031a6c88671e6264f6786c78f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a05cb1ea1d69e0dc752038269545c305e151ec42591f004cc485ea03e344dc2fc188a2953a7b7197f650f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f9c17883f497a4915ee972ccc9c9cce9712c1a6b241610c4a04e77f34ff1444",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa155a55b43520ce00a924527909d9eed13208c7bfb6927f3c08572d8862c02f7",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +331,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f542af",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3cd51",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +349,9 @@
                 "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06ac94",
+                    "0x02" : "0x752e"
                 }
             }
         },
@@ -362,10 +379,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemory_d0g0v0_Homestead" : {
+    "RawDelegateCallGasMemory_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01401b",
-                    "hash" : "0x8d90e0717415e6a7260a25f04cdc59a642956341892e73a0bd2b1a0bc6267c11",
-                    "mixHash" : "0x925d7189d7600940ec5824f80c3bfec5ede04cb506c025851747540be709eb57",
-                    "nonce" : "0x7eab95eafec59ea0",
+                    "gasUsed" : "0x0142af",
+                    "hash" : "0xe0148e245ef79769614f799e4968ae88e8df51a73e5b64ce2864a269dc056048",
+                    "mixHash" : "0xf585181d36ed5f89062985c45cb1ca73168d0ecc99b72534806207f3227cf110",
+                    "nonce" : "0x19211081e827dc29",
                     "number" : "0x01",
                     "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
-                    "receiptTrie" : "0x6b91bfad544df8b4589d71718238e9fc27becc15f48738b87afbe9fb8847b8ca",
-                    "stateRoot" : "0xee8997002061d729473fed2b90057e19d215cba9639e9cb331e5ad38f1bb3368",
+                    "receiptTrie" : "0x8c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00",
+                    "stateRoot" : "0x68687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8997002061d729473fed2b90057e19d215cba9639e9cb331e5ad38f1bb3368a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06b91bfad544df8b4589d71718238e9fc27becc15f48738b87afbe9fb8847b8cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401b8203e880a0925d7189d7600940ec5824f80c3bfec5ede04cb506c025851747540be709eb57887eab95eafec59ea0f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068687baeb298e3f9d3881675b8dd89d9c3ff484e09f061c03af7576b6407aef5a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da08c7948130505b19d45aa19c9e544eb05704bb9df1789bfc5b0b21b62a6fdbf00b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0f585181d36ed5f89062985c45cb1ca73168d0ecc99b72534806207f3227cf1108819211081e827dc29f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d90e0717415e6a7260a25f04cdc59a642956341892e73a0bd2b1a0bc6267c11",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe0148e245ef79769614f799e4968ae88e8df51a73e5b64ce2864a269dc056048",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -436,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5401b",
+                "balance" : "0x4563918244f542af",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cfe5",
+                "balance" : "0xe8d4a3cd51",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -455,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06af28",
+                    "0x01" : "0x06ac94",
                     "0x02" : "0x752e"
                 }
             }
@@ -484,10 +501,10 @@
             }
         }
     },
-    "RawDelegateCallGasMemory_d0g0v0_Metropolis" : {
+    "RawDelegateCallGasMemory_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/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,19 +515,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0142af",
-                    "hash" : "0xdd63b2f33ce9ecf6e95b52bf9bd73c0c49a41e502186e60b6a531e3066d63a3b",
-                    "mixHash" : "0xb482b42a0056fedf9d169742f4084ba1ae54bd336ebd2650967395d746d98517",
-                    "nonce" : "0x38e5ce56165d157a",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x2f946746212bcdcfe7f664c4f000d4a5d746206349f4c50725a421b2ab20804a",
+                    "mixHash" : "0xf2a30afc95819f711bddb6e6a1a0bd125ac24d30a778268c86ce2862ce2e390b",
+                    "nonce" : "0x3882978975c9c0db",
                     "number" : "0x01",
                     "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
-                    "receiptTrie" : "0x63a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47",
-                    "stateRoot" : "0x2d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15ea",
+                    "receiptTrie" : "0x81490df1ffb77edd65dfbf951338abc884c7dcbfe4c13c36c692abd78dae100e",
+                    "stateRoot" : "0x2dfe4178ee764d53c4dd07ebe07304adc4a0cba3bf2b5b0e0685a7c758f29250",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d38cb27d0d4d3aa6d30bb9621f9f112cbc2a9131f0f7a540f3c865b5fde15eaa0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da063a5482ee9bfb7054e6ba203dfffd267060a4ffc36e75562237cf5e7b108be47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830142af8203e880a0b482b42a0056fedf9d169742f4084ba1ae54bd336ebd2650967395d746d985178838e5ce56165d157af862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dfe4178ee764d53c4dd07ebe07304adc4a0cba3bf2b5b0e0685a7c758f29250a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da081490df1ffb77edd65dfbf951338abc884c7dcbfe4c13c36c692abd78dae100eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a0f2a30afc95819f711bddb6e6a1a0bd125ac24d30a778268c86ce2862ce2e390b883882978975c9c0dbf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -547,16 +564,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd63b2f33ce9ecf6e95b52bf9bd73c0c49a41e502186e60b6a531e3066d63a3b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2f946746212bcdcfe7f664c4f000d4a5d746206349f4c50725a421b2ab20804a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49d6ee0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawDelegateCallGasMemory_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01401b",
+                    "hash" : "0x3d97a896e013fbcc06251047373fafa569ef139ab724ce7f18757b9c7548513f",
+                    "mixHash" : "0xe0a0e68dd030e236c9a8eb928e857c5fa19dfd73ddf9236f67c6b50e35f29220",
+                    "nonce" : "0x204fec180f4a7319",
+                    "number" : "0x01",
+                    "parentHash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
+                    "receiptTrie" : "0x6b91bfad544df8b4589d71718238e9fc27becc15f48738b87afbe9fb8847b8ca",
+                    "stateRoot" : "0xee8997002061d729473fed2b90057e19d215cba9639e9cb331e5ad38f1bb3368",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a003bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8997002061d729473fed2b90057e19d215cba9639e9cb331e5ad38f1bb3368a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da06b91bfad544df8b4589d71718238e9fc27becc15f48738b87afbe9fb8847b8cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301401b8203e880a0e0a0e68dd030e236c9a8eb928e857c5fa19dfd73ddf9236f67c6b50e35f2922088204fec180f4a7319f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x03bc45906e43e1d86a6aa651fb2143ae70d61e07d1e6ab1353a2a89170aa6e8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb21a7f9524d67f36674abaad57a04caac536d53316e706531406fcc72a0f68a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3d97a896e013fbcc06251047373fafa569ef139ab724ce7f18757b9c7548513f",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -565,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f542af",
+                "balance" : "0x4563918244f5401b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3cd51",
+                "balance" : "0xe8d4a3cfe5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -584,7 +713,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06ac94",
+                    "0x01" : "0x06af28",
                     "0x02" : "0x752e"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0.json
index 0e09a14dc..d12305e8d 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawDelegateCallGas_d0g0v0_EIP150" : {
+    "RawDelegateCallGas_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/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f47",
-                    "hash" : "0x5e1ad2b40a53268a642cf754d90d271310bf1bab6b401c96510abaa7bd01d670",
-                    "mixHash" : "0xd671f7c61a940343d1e44d1d6aeb3c1eb5d65788ecb74b01b26b5be39a41cd9c",
-                    "nonce" : "0x0767c3dcc1d7231e",
+                    "hash" : "0x389b04681b6a78f6ef3d431bf7b4aa36ff1e6fc0a0ca58989ddbed51153d089e",
+                    "mixHash" : "0x9bf7d199218a404a309156aaf58ad4050090b34ad8496dc0b2f636c163f57a33",
+                    "nonce" : "0x119d258a307d3dec",
                     "number" : "0x01",
                     "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
-                    "receiptTrie" : "0xfcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665",
-                    "stateRoot" : "0x162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957b",
+                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
+                    "stateRoot" : "0x80109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0fcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0d671f7c61a940343d1e44d1d6aeb3c1eb5d65788ecb74b01b26b5be39a41cd9c880767c3dcc1d7231ef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a09bf7d199218a404a309156aaf58ad4050090b34ad8496dc0b2f636c163f57a3388119d258a307d3decf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e1ad2b40a53268a642cf754d90d271310bf1bab6b401c96510abaa7bd01d670",
-        "network" : "EIP150",
+        "lastblockhash" : "0x389b04681b6a78f6ef3d431bf7b4aa36ff1e6fc0a0ca58989ddbed51153d089e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "RawDelegateCallGas_d0g0v0_EIP158" : {
+    "RawDelegateCallGas_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/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,18 +143,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f47",
-                    "hash" : "0x50493b5639bbe336c69387aab2d98ffc23ad084632abe1601edb978dc22a152e",
-                    "mixHash" : "0x572175c1af0479ca6617bd49238dc0fdc786cd69dc7365d21028147316410af3",
-                    "nonce" : "0x2de0165ea257d1f0",
+                    "hash" : "0x5c6c1efcdf45bfa2ed11559cd21a685ccf8c10da6adf5f249aab6c13a86b79cf",
+                    "mixHash" : "0xaccf05538021d45527b2dabccf49dacc7ee49920074d80df08607b9e3153caf3",
+                    "nonce" : "0x3473c81603748f30",
                     "number" : "0x01",
                     "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
-                    "receiptTrie" : "0xfcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665",
-                    "stateRoot" : "0x162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957b",
+                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
+                    "stateRoot" : "0x80109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0fcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0572175c1af0479ca6617bd49238dc0fdc786cd69dc7365d21028147316410af3882de0165ea257d1f0f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0accf05538021d45527b2dabccf49dacc7ee49920074d80df08607b9e3153caf3883473c81603748f30f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,9 +191,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50493b5639bbe336c69387aab2d98ffc23ad084632abe1601edb978dc22a152e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5c6c1efcdf45bfa2ed11559cd21a685ccf8c10da6adf5f249aab6c13a86b79cf",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -243,10 +257,10 @@
             }
         }
     },
-    "RawDelegateCallGas_d0g0v0_Frontier" : {
+    "RawDelegateCallGas_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/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +271,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07a120",
-                    "hash" : "0xdcc905fcbcfe2db8d316b3ed751957c9f6069646a0c54f0faee97b92b104e189",
-                    "mixHash" : "0x73aae86c1badebfa64f66e0312f59590e86b2913f38fb87126220fa337f8514c",
-                    "nonce" : "0xfe9ad6639ecc6ffe",
+                    "gasUsed" : "0x013f47",
+                    "hash" : "0x6d3b28efd1da07cc825be3fc182aaa19f64d6c4429466a4144c32dcd74fbf524",
+                    "mixHash" : "0xb681e8b17b8fea9dd057c4d3cb7ad54e02d49df2a71d112f043080f76013c672",
+                    "nonce" : "0x4ae6fbf5e1ea1a09",
                     "number" : "0x01",
                     "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
-                    "receiptTrie" : "0x86c14e8325fe4ef5959c081a605d750bbf0f371651a3e94a53449c648d3f6086",
-                    "stateRoot" : "0x5e41905a7f73fb4b231efbf056415b88e59070f237e76904fd44302e591f11e8",
+                    "receiptTrie" : "0xfcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665",
+                    "stateRoot" : "0x162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e41905a7f73fb4b231efbf056415b88e59070f237e76904fd44302e591f11e8a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da086c14e8325fe4ef5959c081a605d750bbf0f371651a3e94a53449c648d3f6086b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a073aae86c1badebfa64f66e0312f59590e86b2913f38fb87126220fa337f8514c88fe9ad6639ecc6ffef862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0fcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a0b681e8b17b8fea9dd057c4d3cb7ad54e02d49df2a71d112f043080f76013c672884ae6fbf5e1ea1a09f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcc905fcbcfe2db8d316b3ed751957c9f6069646a0c54f0faee97b92b104e189",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6d3b28efd1da07cc825be3fc182aaa19f64d6c4429466a4144c32dcd74fbf524",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -317,14 +331,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fba120",
+                "balance" : "0x4563918244f53f47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49d6ee0",
+                "balance" : "0xe8d4a3d0b9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +349,9 @@
                 "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x06affc",
+                    "0x02" : "0x752e"
                 }
             }
         },
@@ -362,10 +379,10 @@
             }
         }
     },
-    "RawDelegateCallGas_d0g0v0_Homestead" : {
+    "RawDelegateCallGas_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/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013cb3",
-                    "hash" : "0xca7911193e2e9aa89d77f8292e9d523fd82871f1da3610571267f644064a86c1",
-                    "mixHash" : "0x902f92de777f3a7d1c4dc169a52b81be0d3aa4af88f202b38d5a28db93fa4454",
-                    "nonce" : "0x151540f1caf3b845",
+                    "gasUsed" : "0x013f47",
+                    "hash" : "0x8c9fac9db68d798e3cd025b9a2832326342c75d7771ea8956ceb5c0f6777f982",
+                    "mixHash" : "0x71f13830e662aedde6b2c9fac08cccb5f6ef1ce2e5c8355e9bdc26ccaed5cfb4",
+                    "nonce" : "0x011bd05a03ef8970",
                     "number" : "0x01",
                     "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
-                    "receiptTrie" : "0xb3755183c6c3ba3db7c8e0ef30e19338533fcc2836d7e03f8deb07cc9ef69d70",
-                    "stateRoot" : "0x92f4e2683cf5ff8fa6595d7591918386895b66a3127dc528c9949957290dde53",
+                    "receiptTrie" : "0xfcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665",
+                    "stateRoot" : "0x162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092f4e2683cf5ff8fa6595d7591918386895b66a3127dc528c9949957290dde53a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b3755183c6c3ba3db7c8e0ef30e19338533fcc2836d7e03f8deb07cc9ef69d70b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb38203e880a0902f92de777f3a7d1c4dc169a52b81be0d3aa4af88f202b38d5a28db93fa445488151540f1caf3b845f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0162d607b93efe770428aceb6178f3882037fc3774317467e59a772383ba2957ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0fcf1bbb93356bce157d220827847413c8e9b16cf58fe02d383cf678a18532665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a071f13830e662aedde6b2c9fac08cccb5f6ef1ce2e5c8355e9bdc26ccaed5cfb488011bd05a03ef8970f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca7911193e2e9aa89d77f8292e9d523fd82871f1da3610571267f644064a86c1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8c9fac9db68d798e3cd025b9a2832326342c75d7771ea8956ceb5c0f6777f982",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -436,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53cb3",
+                "balance" : "0x4563918244f53f47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d34d",
+                "balance" : "0xe8d4a3d0b9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -455,7 +472,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06b290",
+                    "0x01" : "0x06affc",
                     "0x02" : "0x752e"
                 }
             }
@@ -484,10 +501,10 @@
             }
         }
     },
-    "RawDelegateCallGas_d0g0v0_Metropolis" : {
+    "RawDelegateCallGas_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/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,19 +515,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f47",
-                    "hash" : "0x7b39a988bea828e4ca95174f57a8221606712981555e82f499652b7b827adccd",
-                    "mixHash" : "0x1820ab8c6bdd0c4fd08d7500fbcdbb864ff9e3c466f89d73422ece730ae0aad1",
-                    "nonce" : "0x7270532269dfbf23",
+                    "gasUsed" : "0x07a120",
+                    "hash" : "0x803c1afad4c18d06afb850eef72d19cde717fc25d9f56a0a190d3e644e6712f0",
+                    "mixHash" : "0x21bce4150411cd642e6dc237def45e5c5a96bb0dfef52bb45de7b37768f9bf51",
+                    "nonce" : "0x0a906afffebb2230",
                     "number" : "0x01",
                     "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
-                    "receiptTrie" : "0xc993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470",
-                    "stateRoot" : "0x80109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151",
+                    "receiptTrie" : "0x86c14e8325fe4ef5959c081a605d750bbf0f371651a3e94a53449c648d3f6086",
+                    "stateRoot" : "0x5e41905a7f73fb4b231efbf056415b88e59070f237e76904fd44302e591f11e8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080109c82381441ebc5caf69cf8e2c07446ba9be392a51af64c19003beeddf151a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0c993696efacbb48d950994de2d0045cde913b1273f6de5ec300255470ff20470b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f478203e880a01820ab8c6bdd0c4fd08d7500fbcdbb864ff9e3c466f89d73422ece730ae0aad1887270532269dfbf23f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e41905a7f73fb4b231efbf056415b88e59070f237e76904fd44302e591f11e8a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da086c14e8325fe4ef5959c081a605d750bbf0f371651a3e94a53449c648d3f6086b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307a1208203e880a021bce4150411cd642e6dc237def45e5c5a96bb0dfef52bb45de7b37768f9bf51880a906afffebb2230f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -547,16 +564,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b39a988bea828e4ca95174f57a8221606712981555e82f499652b7b827adccd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x803c1afad4c18d06afb850eef72d19cde717fc25d9f56a0a190d3e644e6712f0",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fba120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49d6ee0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawDelegateCallGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawDelegateCallGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013cb3",
+                    "hash" : "0xedd685e90c81dcdf0f3e467325626f66526d41b511e4392e0d727a7d83197e93",
+                    "mixHash" : "0x1fad6f2fd82837407e1adce3f7c2340e7339e60d46acd7cc5fb530ebe8a1eebb",
+                    "nonce" : "0x9fe1dcaeb95b3b25",
+                    "number" : "0x01",
+                    "parentHash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
+                    "receiptTrie" : "0xb3755183c6c3ba3db7c8e0ef30e19338533fcc2836d7e03f8deb07cc9ef69d70",
+                    "stateRoot" : "0x92f4e2683cf5ff8fa6595d7591918386895b66a3127dc528c9949957290dde53",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a079a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092f4e2683cf5ff8fa6595d7591918386895b66a3127dc528c9949957290dde53a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0b3755183c6c3ba3db7c8e0ef30e19338533fcc2836d7e03f8deb07cc9ef69d70b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb38203e880a01fad6f2fd82837407e1adce3f7c2340e7339e60d46acd7cc5fb530ebe8a1eebb889fe1dcaeb95b3b25f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x79a226c727b057dd02685ecf8d29ea3b15af896d432e7e7acf89fdacca72b069",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e65f8602da23cf114eb718ed912996616696b696a8451b953227dbbf1c7a64a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xedd685e90c81dcdf0f3e467325626f66526d41b511e4392e0d727a7d83197e93",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
@@ -565,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f47",
+                "balance" : "0x4563918244f53cb3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b9",
+                "balance" : "0xe8d4a3d34d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -584,7 +713,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x074f16",
-                    "0x01" : "0x06affc",
+                    "0x01" : "0x06b290",
                     "0x02" : "0x752e"
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0.json
index e794ed89c..8886fcbb5 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawExtCodeCopyGas_d0g0v0_EIP150" : {
+    "RawExtCodeCopyGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf120",
-                    "hash" : "0xdc14f942951f2492917cb5217c966d060d9d202298b707e2a439fcde6546b5d7",
-                    "mixHash" : "0xf7efa82592314f8b13c6983a645d4923d06a1886ca414850625042cb2d6607f1",
-                    "nonce" : "0xb7db5ddb7bc4e39f",
+                    "hash" : "0x1627c313e6f1f878eb591a793734159d49e854f374c9e2652bbc4af1e4fedf5c",
+                    "mixHash" : "0x1ced2a4afd0fc8ffef9e089aa11339c66a77031a144a201935bacddcfe2f7a84",
+                    "nonce" : "0x2fce569dabe5cb8b",
                     "number" : "0x01",
                     "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
-                    "receiptTrie" : "0xcae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536",
-                    "stateRoot" : "0x28df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257",
+                    "receiptTrie" : "0x5cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165",
+                    "stateRoot" : "0xc07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a0f7efa82592314f8b13c6983a645d4923d06a1886ca414850625042cb2d6607f188b7db5ddb7bc4e39ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a01ced2a4afd0fc8ffef9e089aa11339c66a77031a144a201935bacddcfe2f7a84882fce569dabe5cb8bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc14f942951f2492917cb5217c966d060d9d202298b707e2a439fcde6546b5d7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1627c313e6f1f878eb591a793734159d49e854f374c9e2652bbc4af1e4fedf5c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RawExtCodeCopyGas_d0g0v0_EIP158" : {
+    "RawExtCodeCopyGas_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf120",
+                    "hash" : "0x5df0231c8be8e803e157e5c45fd14558acf44e7a02cc83ba6d0e279d0a3149d9",
+                    "mixHash" : "0x45cd8da6c78666ad2ab02ee76dda1112e97627155a2017dadd1db693977de677",
+                    "nonce" : "0xd373fa8afd61cf0a",
+                    "number" : "0x01",
+                    "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
+                    "receiptTrie" : "0x5cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165",
+                    "stateRoot" : "0xc07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a045cd8da6c78666ad2ab02ee76dda1112e97627155a2017dadd1db693977de67788d373fa8afd61cf0af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5df0231c8be8e803e157e5c45fd14558acf44e7a02cc83ba6d0e279d0a3149d9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a41ee0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005560146000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x0884c3"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60005560146000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawExtCodeCopyGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf120",
-                    "hash" : "0xb4c10527825faf0152a56d4e5b8840f99d2173ab15c512205801410d702f4279",
-                    "mixHash" : "0xdfe19c753a78de541de1269bc669040d67e8cfe637aeff0f682c4a2d6105eef9",
-                    "nonce" : "0xcf3cff664c189e41",
+                    "hash" : "0x852196550cc78d14d33af1c08b7dadb9c02a055b7351dad99a1061ab3508500a",
+                    "mixHash" : "0xe1379a9e35d9f94715b8603cfe71ded8655fa69c36fb393afad5fbf5c47af42f",
+                    "nonce" : "0xe83dca06218fd4bb",
                     "number" : "0x01",
                     "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
                     "receiptTrie" : "0xcae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a0dfe19c753a78de541de1269bc669040d67e8cfe637aeff0f682c4a2d6105eef988cf3cff664c189e41f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a0e1379a9e35d9f94715b8603cfe71ded8655fa69c36fb393afad5fbf5c47af42f88e83dca06218fd4bbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4c10527825faf0152a56d4e5b8840f99d2173ab15c512205801410d702f4279",
-        "network" : "EIP158",
+        "lastblockhash" : "0x852196550cc78d14d33af1c08b7dadb9c02a055b7351dad99a1061ab3508500a",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RawExtCodeCopyGas_d0g0v0_Frontier" : {
+    "RawExtCodeCopyGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xee78",
-                    "hash" : "0x8b23685f9d83b1566b15b9162e1ea6ce121bdfe0aac0600875269ac10a77b563",
-                    "mixHash" : "0x680ae9f38b0ac627241349892d0cbc0866fef7c93e52f5e09aa74dc9bcef7a8e",
-                    "nonce" : "0x462727e8be667839",
+                    "gasUsed" : "0xf120",
+                    "hash" : "0x4e627d16db6cb7381c0d2d92cc3c8896ce7f57a72228126f83e600c2231004dc",
+                    "mixHash" : "0x10ab072abc3ce2d5312412b17fd7d09b660a12b330ec468831283b22baa2aa65",
+                    "nonce" : "0xeb8bebe9ae708bed",
                     "number" : "0x01",
                     "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
-                    "receiptTrie" : "0x5c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dc",
-                    "stateRoot" : "0xbf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2",
+                    "receiptTrie" : "0xcae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536",
+                    "stateRoot" : "0x28df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee788203e880a0680ae9f38b0ac627241349892d0cbc0866fef7c93e52f5e09aa74dc9bcef7a8e88462727e8be667839f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028df9710bdb5fb740819591eeeb5e66d2d5403a0f16f45aa07738705c44a7257a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0cae56fb8b6eb7be377acb0b74d2fa4cc82b4962a82e4e6b76c7c108ded75f536b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a010ab072abc3ce2d5312412b17fd7d09b660a12b330ec468831283b22baa2aa6588eb8bebe9ae708bedf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b23685f9d83b1566b15b9162e1ea6ce121bdfe0aac0600875269ac10a77b563",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4e627d16db6cb7381c0d2d92cc3c8896ce7f57a72228126f83e600c2231004dc",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -315,14 +450,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ee78",
+                "balance" : "0x4563918244f4f120",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a42188",
+                "balance" : "0xe8d4a41ee0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,7 +469,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x08876b"
+                    "0x01" : "0x0884c3"
                 }
             }
         },
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RawExtCodeCopyGas_d0g0v0_Homestead" : {
+    "RawExtCodeCopyGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee78",
-                    "hash" : "0x0d6c4c5ffbe7541971908458fea2c42efa107779b6f54298a2225843a9d599bb",
-                    "mixHash" : "0x7b25a7d1f46a766da29693c07322646d28135d79d46b1dc4b2e92060879b9982",
-                    "nonce" : "0x39b1b906fee36480",
+                    "hash" : "0x04b210f914fd64c72bf7be512aa2f4230fc49186bfc3a01d8fc334ea889ce2cc",
+                    "mixHash" : "0x8d3e7ba7836e9e45462c1df8a33fd87fb8ef31754b95c0a49862516ba6f9f492",
+                    "nonce" : "0x9ba2d6797f23ec42",
                     "number" : "0x01",
                     "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
                     "receiptTrie" : "0x5c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dc",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee788203e880a07b25a7d1f46a766da29693c07322646d28135d79d46b1dc4b2e92060879b99828839b1b906fee36480f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee788203e880a08d3e7ba7836e9e45462c1df8a33fd87fb8ef31754b95c0a49862516ba6f9f492889ba2d6797f23ec42f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d6c4c5ffbe7541971908458fea2c42efa107779b6f54298a2225843a9d599bb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x04b210f914fd64c72bf7be512aa2f4230fc49186bfc3a01d8fc334ea889ce2cc",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RawExtCodeCopyGas_d0g0v0_Metropolis" : {
+    "RawExtCodeCopyGas_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawExtCodeCopyGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf120",
-                    "hash" : "0x919754b3d8dad8a49162cd775e0b463ade89a323d83c8bc574f38023405b8962",
-                    "mixHash" : "0xc0f67c8538d629857c29b08e1e804eade80dc2011f7c65f3595a6a8eed6516e6",
-                    "nonce" : "0x0e5fa6472041ebf6",
+                    "gasUsed" : "0xee78",
+                    "hash" : "0x7865c02c76743d04ccc537f2bcf36d6696915ffbb11b4b6975f290a508c62d35",
+                    "mixHash" : "0x30d05f9ba498aebc16237c544c1d89d5eb10cf638ced1bd4067bb43306d5fd35",
+                    "nonce" : "0x64ae962d49084b49",
                     "number" : "0x01",
                     "parentHash" : "0x6996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469ae",
-                    "receiptTrie" : "0x5cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165",
-                    "stateRoot" : "0xc07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4",
+                    "receiptTrie" : "0x5c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dc",
+                    "stateRoot" : "0xbf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c07ab2e2e7397bfdcdf25ea87d08aa9b7ffdd4d9e179f05267981560b48cf3e4a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05cfbe50dbe92591b321bbb77cc57a92a34917e7a0d1afdeac1e0bddd69601165b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1208203e880a0c0f67c8538d629857c29b08e1e804eade80dc2011f7c65f3595a6a8eed6516e6880e5fa6472041ebf6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a06996d3e0a2a21faaee7e230ad1ccc4e488f53cc5a277d7aa330e9688b45469aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf59869bbf807c90809bfe5fc6342cb718fa037f6109b97edf33082376c7cef2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a05c1ba388a4fd0862770036cad9a56a0f4504b77c21708dcd546949f71460b2dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee788203e880a030d05f9ba498aebc16237c544c1d89d5eb10cf638ced1bd4067bb43306d5fd358864ae962d49084b49f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +681,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad13aabca71bcc9bc3485eae3aefb865abe90f85023bcda90a1584f27047558da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x919754b3d8dad8a49162cd775e0b463ade89a323d83c8bc574f38023405b8962",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7865c02c76743d04ccc537f2bcf36d6696915ffbb11b4b6975f290a508c62d35",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -564,14 +692,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f120",
+                "balance" : "0x4563918244f4ee78",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a41ee0",
+                "balance" : "0xe8d4a42188",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -583,7 +711,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x0884c3"
+                    "0x01" : "0x08876b"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0.json
index 276d409d7..85e3a0215 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawExtCodeCopyMemoryGas_d0g0v0_EIP150" : {
+    "RawExtCodeCopyMemoryGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfa2e",
-                    "hash" : "0x5939ffb4cde6d662bb7af39b3e23683abd63f62be98063b3596f0a7f559b932f",
-                    "mixHash" : "0x65e595bd724f4de84de0eeb314e66cf275f0056fdb32275b931376fb016dd4af",
-                    "nonce" : "0x2159421069c578be",
+                    "hash" : "0xde0be397ce777412076633e154e3ad71831fe290e92821f62098d8d27ad2fdd4",
+                    "mixHash" : "0xa77402ef72e874a263082a1b1904aa1c50fd6e4d08c3753c8db220ae09a7a0b6",
+                    "nonce" : "0xc14b379e6d5c820a",
                     "number" : "0x01",
                     "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
-                    "receiptTrie" : "0x758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300",
-                    "stateRoot" : "0x01fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962",
+                    "receiptTrie" : "0xf292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36",
+                    "stateRoot" : "0x7e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a065e595bd724f4de84de0eeb314e66cf275f0056fdb32275b931376fb016dd4af882159421069c578bef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a0a77402ef72e874a263082a1b1904aa1c50fd6e4d08c3753c8db220ae09a7a0b688c14b379e6d5c820af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5939ffb4cde6d662bb7af39b3e23683abd63f62be98063b3596f0a7f559b932f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xde0be397ce777412076633e154e3ad71831fe290e92821f62098d8d27ad2fdd4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RawExtCodeCopyMemoryGas_d0g0v0_EIP158" : {
+    "RawExtCodeCopyMemoryGas_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xfa2e",
+                    "hash" : "0xa798694a2b58debbe63fed7c90257740c92da2c85b89775d9db0ace838bcfb10",
+                    "mixHash" : "0xba58b18eca2870b392a6b8c7226c83c012ea99bdad0224f66a7f2a0a5e909c7e",
+                    "nonce" : "0x985469673dbd8674",
+                    "number" : "0x01",
+                    "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
+                    "receiptTrie" : "0xf292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36",
+                    "stateRoot" : "0x7e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a0ba58b18eca2870b392a6b8c7226c83c012ea99bdad0224f66a7f2a0a5e909c7e88985469673dbd8674f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x07d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa798694a2b58debbe63fed7c90257740c92da2c85b89775d9db0ace838bcfb10",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fa2e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a415d2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055612b706000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x087bb5"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055612b706000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawExtCodeCopyMemoryGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfa2e",
-                    "hash" : "0x61624f32672c6f182a6aa01348fd2e53234e3d7c555b59ee9e82ceb4c70eba2d",
-                    "mixHash" : "0x9847523f681a8427b154049b2e5d35040e10e50bceefd836178741542b8a3a66",
-                    "nonce" : "0xd05568f42b0937b4",
+                    "hash" : "0xa728f20dae806f1e7fadea0eeec9b308bd8deb27df4542180739776dea393274",
+                    "mixHash" : "0xdee28dded7f8e7af7346f5d33049784c0402b71b94459f298206b79297baf66a",
+                    "nonce" : "0x1bb0f27c029a7749",
                     "number" : "0x01",
                     "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
                     "receiptTrie" : "0x758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a09847523f681a8427b154049b2e5d35040e10e50bceefd836178741542b8a3a6688d05568f42b0937b4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a0dee28dded7f8e7af7346f5d33049784c0402b71b94459f298206b79297baf66a881bb0f27c029a7749f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61624f32672c6f182a6aa01348fd2e53234e3d7c555b59ee9e82ceb4c70eba2d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa728f20dae806f1e7fadea0eeec9b308bd8deb27df4542180739776dea393274",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RawExtCodeCopyMemoryGas_d0g0v0_Frontier" : {
+    "RawExtCodeCopyMemoryGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf786",
-                    "hash" : "0x836c345e528f2d12be46caaab54e0afe7880f17e481e9890df32d64c7dbdec3f",
-                    "mixHash" : "0x9a5cc8b6610f5ed5561a3e220984d4c6717e4529e1e1d2eeff7417fca76547e5",
-                    "nonce" : "0xa48f313584ee7dca",
+                    "gasUsed" : "0xfa2e",
+                    "hash" : "0x78698713e0a1e2b2f0a42b36b8044d5cdc6b2ab1f7439a61c362bc998e821acc",
+                    "mixHash" : "0xcdf856be19d405f00cdffba6149bdb8a791ada9726d991b9b0c572b230f174b2",
+                    "nonce" : "0xb5df46a9aff477f1",
                     "number" : "0x01",
                     "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
-                    "receiptTrie" : "0x94088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323",
-                    "stateRoot" : "0x7d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daa",
+                    "receiptTrie" : "0x758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300",
+                    "stateRoot" : "0x01fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daaa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a094088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f7868203e880a09a5cc8b6610f5ed5561a3e220984d4c6717e4529e1e1d2eeff7417fca76547e588a48f313584ee7dcaf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001fc4d144e7ba7f839d87f363c3ea25e6f999f2660994a223349c4016c919962a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0758bcbf5bf24665abe891c0ea24588f263fb15dabdcb7b571aca494f7c4b0300b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a0cdf856be19d405f00cdffba6149bdb8a791ada9726d991b9b0c572b230f174b288b5df46a9aff477f1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x836c345e528f2d12be46caaab54e0afe7880f17e481e9890df32d64c7dbdec3f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x78698713e0a1e2b2f0a42b36b8044d5cdc6b2ab1f7439a61c362bc998e821acc",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -315,14 +450,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f786",
+                "balance" : "0x4563918244f4fa2e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4187a",
+                "balance" : "0xe8d4a415d2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,7 +469,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x087e5d"
+                    "0x01" : "0x087bb5"
                 }
             }
         },
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RawExtCodeCopyMemoryGas_d0g0v0_Homestead" : {
+    "RawExtCodeCopyMemoryGas_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/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf786",
-                    "hash" : "0xdb06bfc4287237e1c68f4fa9527d3cf41aef81919be315a15363866c16abc76d",
-                    "mixHash" : "0xcb66711bb03fc4155b08558cb5fe1a11de9dd08f5481fa7224cd7aae66a0c54a",
-                    "nonce" : "0xb8220d19b7ee95aa",
+                    "hash" : "0x67223edc5e7bdb67864038a0071ac72dda9a19b09b27b663ff6f73c35eb534a9",
+                    "mixHash" : "0xb1fdf7bbbf702040f37043d2dd21a907d1600cf8d1b4823e079405781043ce98",
+                    "nonce" : "0x852c513cca6c30ae",
                     "number" : "0x01",
                     "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
                     "receiptTrie" : "0x94088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daaa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a094088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f7868203e880a0cb66711bb03fc4155b08558cb5fe1a11de9dd08f5481fa7224cd7aae66a0c54a88b8220d19b7ee95aaf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daaa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a094088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f7868203e880a0b1fdf7bbbf702040f37043d2dd21a907d1600cf8d1b4823e079405781043ce9888852c513cca6c30aef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb06bfc4287237e1c68f4fa9527d3cf41aef81919be315a15363866c16abc76d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x67223edc5e7bdb67864038a0071ac72dda9a19b09b27b663ff6f73c35eb534a9",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RawExtCodeCopyMemoryGas_d0g0v0_Metropolis" : {
+    "RawExtCodeCopyMemoryGas_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfa2e",
-                    "hash" : "0x76c6f15e7a187a1055c860c4c5a122819bbe59f79a56cf804b14f3b013028275",
-                    "mixHash" : "0x9fa57547fae73a43e25b2c5ea338f157eda8c3bdb79f852bac37cea2c759287a",
-                    "nonce" : "0x22b6ec4869848378",
+                    "gasUsed" : "0xf786",
+                    "hash" : "0x403584cfa7d9a96af80e0a2fd27205b95d06a5cfeed1b50790b7c7ad5d3e52a0",
+                    "mixHash" : "0x9605058c83c7d488e345f463dd049676f464972c4bd6358ab3d9fdaf4cdd3c8f",
+                    "nonce" : "0xa7c0a46b19ee2c6f",
                     "number" : "0x01",
                     "parentHash" : "0xaed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69",
-                    "receiptTrie" : "0xf292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36",
-                    "stateRoot" : "0x7e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428f",
+                    "receiptTrie" : "0x94088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323",
+                    "stateRoot" : "0x7d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e493803ad58be898a4a7bb386385349aaa35a967864c38b81dee3a19ff8428fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f292e2bc719d08b52b7f0e3f8cce0be225ec61f769bd46441276bbf995017e36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa2e8203e880a09fa57547fae73a43e25b2c5ea338f157eda8c3bdb79f852bac37cea2c759287a8822b6ec4869848378f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a0aed00a00a7ddbd9f7eb1dfc50b3a86c6c69e27d00a1050cf77d21befdf9d1c69a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d69a54bd2d0f7d446bc31786e74a5b9fd1bf1c7dc6ec2aae191cb25f4100daaa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a094088d61262e6231de0f44272c3370ec198b55aca2a3ae901f0423c2d6574323b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f7868203e880a09605058c83c7d488e345f463dd049676f464972c4bd6358ab3d9fdaf4cdd3c8f88a7c0a46b19ee2c6ff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +681,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007d9752986bb3dad9eb213b8e55ec092696895be20ec04ad2840a15c6647a02ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76c6f15e7a187a1055c860c4c5a122819bbe59f79a56cf804b14f3b013028275",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x403584cfa7d9a96af80e0a2fd27205b95d06a5cfeed1b50790b7c7ad5d3e52a0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -564,14 +692,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fa2e",
+                "balance" : "0x4563918244f4f786",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a415d2",
+                "balance" : "0xe8d4a4187a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -583,7 +711,7 @@
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x08d5b6",
-                    "0x01" : "0x087bb5"
+                    "0x01" : "0x087e5d"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0.json
index 052b300c4..ce7941b9f 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawExtCodeSizeGas_d0g0v0_EIP150" : {
+    "RawExtCodeSizeGas_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/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x193e74a666416c00d64b8ee7b1eb2367f3498620cce6dc2f413b72e7c731e082",
-                    "mixHash" : "0xe31a0668ca886bce73c1a6026acd0f672004a0f811556cec4ce5953a578dbd5e",
-                    "nonce" : "0xd438305620f7fa93",
+                    "hash" : "0x935dca180210e5e66b19503c77c0fcf7f8e86b3a6f446cde137107738594e023",
+                    "mixHash" : "0x560ef594728ae92a80df39daff133c4320d8c25f5f759834c5ccb2fa7dfde70f",
+                    "nonce" : "0x713174dd83b7a164",
                     "number" : "0x01",
                     "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
-                    "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
-                    "stateRoot" : "0x5ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2",
+                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
+                    "stateRoot" : "0xbe16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0e31a0668ca886bce73c1a6026acd0f672004a0f811556cec4ce5953a578dbd5e88d438305620f7fa93f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0560ef594728ae92a80df39daff133c4320d8c25f5f759834c5ccb2fa7dfde70f88713174dd83b7a164f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x193e74a666416c00d64b8ee7b1eb2367f3498620cce6dc2f413b72e7c731e082",
-        "network" : "EIP150",
+        "lastblockhash" : "0x935dca180210e5e66b19503c77c0fcf7f8e86b3a6f446cde137107738594e023",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "RawExtCodeSizeGas_d0g0v0_EIP158" : {
+    "RawExtCodeSizeGas_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/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x443a4d181262a23c9752161dd2d62574da651816149de1fc081bbd0f3353cef6",
-                    "mixHash" : "0x528fb30abc9b3ce31d247956b9738470974cacf7fbb51bc20b25c6cd9742e2b4",
-                    "nonce" : "0x32f878c1524456bb",
+                    "hash" : "0xc29cc9251539f1cee659ff3510ae6026a25a961d3be219b7585f45af1437fe38",
+                    "mixHash" : "0x2458c526295893aea3ad3f3e74c496909f967ba5848a6474ad7b3f89aa697612",
+                    "nonce" : "0xead54ca5227f4059",
                     "number" : "0x01",
                     "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
-                    "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
-                    "stateRoot" : "0x5ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2",
+                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
+                    "stateRoot" : "0xbe16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0528fb30abc9b3ce31d247956b9738470974cacf7fbb51bc20b25c6cd9742e2b48832f878c1524456bbf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a02458c526295893aea3ad3f3e74c496909f967ba5848a6474ad7b3f89aa69761288ead54ca5227f4059f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x443a4d181262a23c9752161dd2d62574da651816149de1fc081bbd0f3353cef6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc29cc9251539f1cee659ff3510ae6026a25a961d3be219b7585f45af1437fe38",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "RawExtCodeSizeGas_d0g0v0_Frontier" : {
+    "RawExtCodeSizeGas_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/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x722c7cb612395a98088c281ab4d018f59b2641c14c0bff85ade2bef17d3d5fe8",
-                    "mixHash" : "0xae1ca9c1886580b8936690ca59da95545d6677606aff29e115847aeee0c8fa29",
-                    "nonce" : "0x0fb234f32ad48d57",
+                    "hash" : "0x5841860da2829b1fb5095ab97ca40d347318012e8bedca7d70028f88c87c0a81",
+                    "mixHash" : "0xbfd794d69fad6b368325f138c159ad44af34203747912eec05a35c6a4ee25ffa",
+                    "nonce" : "0x8de02c42b3c53d43",
                     "number" : "0x01",
                     "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
                     "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0ae1ca9c1886580b8936690ca59da95545d6677606aff29e115847aeee0c8fa29880fb234f32ad48d57f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0bfd794d69fad6b368325f138c159ad44af34203747912eec05a35c6a4ee25ffa888de02c42b3c53d43f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x722c7cb612395a98088c281ab4d018f59b2641c14c0bff85ade2bef17d3d5fe8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5841860da2829b1fb5095ab97ca40d347318012e8bedca7d70028f88c87c0a81",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "RawExtCodeSizeGas_d0g0v0_Homestead" : {
+    "RawExtCodeSizeGas_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/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +391,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x1ebaa5307b116a9ec26d99a9246182cf3bde0d16bdb7147714638b258a30498f",
-                    "mixHash" : "0xfeacc17d7cf825d0cc340bcb457e444ecc8d51f4776297777d80ba9c8f4085be",
-                    "nonce" : "0xbab771f56711142e",
+                    "hash" : "0x200cd98d888b06f8c485a08a70c16f34363b4b5491e1ff1143fabd56bba13882",
+                    "mixHash" : "0xe05d22511504a4aad6683c9acb0dca6f13615b18a53790fc2f2ed6c79be8503e",
+                    "nonce" : "0xf00caff28b736a60",
                     "number" : "0x01",
                     "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
                     "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
@@ -388,7 +402,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0feacc17d7cf825d0cc340bcb457e444ecc8d51f4776297777d80ba9c8f4085be88bab771f56711142ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0e05d22511504a4aad6683c9acb0dca6f13615b18a53790fc2f2ed6c79be8503e88f00caff28b736a60f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ebaa5307b116a9ec26d99a9246182cf3bde0d16bdb7147714638b258a30498f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x200cd98d888b06f8c485a08a70c16f34363b4b5491e1ff1143fabd56bba13882",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
@@ -483,10 +497,10 @@
             }
         }
     },
-    "RawExtCodeSizeGas_d0g0v0_Metropolis" : {
+    "RawExtCodeSizeGas_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/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee52",
-                    "hash" : "0x20b07951547968f4943a63cd6958a11114d969bd9ae43fe1a241557af696ec1f",
-                    "mixHash" : "0x3d9602f79e2de569e336276de240ccdc3c3158c73d41f62f89749198e2da8f02",
-                    "nonce" : "0xfb4f8e1c3ce82170",
+                    "hash" : "0xf9cf207ef850f25bd069f9b8828dead3d46e5933c5f82cd3d0417a0bbdabf3b6",
+                    "mixHash" : "0x76597720d90901e2c22ec7b352e0cf3bb1732701205ebb34960c9b816bb03fd8",
+                    "nonce" : "0x358a2cc031062cc7",
                     "number" : "0x01",
                     "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
-                    "receiptTrie" : "0x8fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1e",
-                    "stateRoot" : "0xbe16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5c",
+                    "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
+                    "stateRoot" : "0x5ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be16f6dd35d4e4fd8f72c1b54234a155cf19c7c18115a18f3d994f30d98f9e5ca059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a08fb872c658eac80ecdb7a01238f84a582a02b7e38e6e252126a86f31d831bf1eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a03d9602f79e2de569e336276de240ccdc3c3158c73d41f62f89749198e2da8f0288fb4f8e1c3ce82170f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a076597720d90901e2c22ec7b352e0cf3bb1732701205ebb34960c9b816bb03fd888358a2cc031062cc7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20b07951547968f4943a63cd6958a11114d969bd9ae43fe1a241557af696ec1f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf9cf207ef850f25bd069f9b8828dead3d46e5933c5f82cd3d0417a0bbdabf3b6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ee52",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a421ae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x088791"
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x0112233445566778899101112131415161718191202122232425",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawExtCodeSizeGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawExtCodeSizeGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xee52",
+                    "hash" : "0xd38a484b4f94ae4bfb7f8f91e44b67e5172b4a1fc37878ef38cfe4f4c8374532",
+                    "mixHash" : "0xb60a9f770613e4828baf28447e6028f701946135b416e76dca75808002eb09c8",
+                    "nonce" : "0xd5bd425b897da80b",
+                    "number" : "0x01",
+                    "parentHash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
+                    "receiptTrie" : "0x42f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80",
+                    "stateRoot" : "0x5ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a04b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaefa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ed6ce1dbba58e76004a222c8acc3d67093a9e1b0cf788120aeb61e3f1e1a8b2a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a042f153fd48ac111bece598902fb86fbaf5102a78f81a4cfe6b543a64ab05ec80b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee528203e880a0b60a9f770613e4828baf28447e6028f701946135b416e76dca75808002eb09c888d5bd425b897da80bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4b698f018347ee67e2308d47700205f00834d043a6629ac6985dba38e4d2aaef",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dabe466683ccfbc3df3d959bd62c128fe51e45ffaaa5b2e948cf70a8ec1a037a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd38a484b4f94ae4bfb7f8f91e44b67e5172b4a1fc37878ef38cfe4f4c8374532",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",