Hive tests with Byzantine

65 files changed, 10459 insertions, 3120 deletions

diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2_d0g0v0.json
index 6ed673388..e86907bfb 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "calldatacopy_dejavu2_d0g0v0_EIP150" : {
+    "calldatacopy_dejavu2_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/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa0a4",
-                    "hash" : "0xf7088506b2c5d6a7876b7d558b15ef0f3627ac2bd381107505302c4ebacf4bed",
-                    "mixHash" : "0x1fe095456bf9f9e8b7ff7fe8c210a52401260e09d48e6f749ab0af9110926cc3",
-                    "nonce" : "0x1e896ae750f5c4d3",
+                    "hash" : "0x7b5cfeaad6cfccf8c6e434cd088793d35f15e5b15e453c0a284c01009930242f",
+                    "mixHash" : "0x1bca7ff72fe85e2815c4f9121b3039516a8b5359fa3680d8e5f0067c98183b3a",
+                    "nonce" : "0xd8968215d5389ea0",
                     "number" : "0x01",
                     "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
-                    "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
-                    "stateRoot" : "0xca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734f",
+                    "receiptTrie" : "0x27ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876e",
+                    "stateRoot" : "0xa969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a01fe095456bf9f9e8b7ff7fe8c210a52401260e09d48e6f749ab0af9110926cc3881e896ae750f5c4d3f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a027ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a01bca7ff72fe85e2815c4f9121b3039516a8b5359fa3680d8e5f0067c98183b3a88d8968215d5389ea0f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7088506b2c5d6a7876b7d558b15ef0f3627ac2bd381107505302c4ebacf4bed",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7b5cfeaad6cfccf8c6e434cd088793d35f15e5b15e453c0a284c01009930242f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "calldatacopy_dejavu2_d0g0v0_EIP158" : {
+    "calldatacopy_dejavu2_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/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa0a4",
-                    "hash" : "0x81a00d48dcab903916c7a307f5eb94492e9347dd57860b6a0112e144cae25137",
-                    "mixHash" : "0xc1759e8d4fa3a3f8f00c1a5ef9d1d27a254125bde2951f8f75e8607ca09cb081",
-                    "nonce" : "0x1c4a256a415d63d7",
+                    "hash" : "0x0acdc8c25536fda6b4f6f17220b6276a51ccba3eae237b221d909dc4c5095695",
+                    "mixHash" : "0xde77348ba19cc095ed8bd2aaaaf94daa6c946c6869c86cd4265427e24064677b",
+                    "nonce" : "0x72a866882092d46c",
                     "number" : "0x01",
                     "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
-                    "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
-                    "stateRoot" : "0xca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734f",
+                    "receiptTrie" : "0x27ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876e",
+                    "stateRoot" : "0xa969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0c1759e8d4fa3a3f8f00c1a5ef9d1d27a254125bde2951f8f75e8607ca09cb081881c4a256a415d63d7f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a027ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0de77348ba19cc095ed8bd2aaaaf94daa6c946c6869c86cd4265427e24064677b8872a866882092d46cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81a00d48dcab903916c7a307f5eb94492e9347dd57860b6a0112e144cae25137",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0acdc8c25536fda6b4f6f17220b6276a51ccba3eae237b221d909dc4c5095695",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "calldatacopy_dejavu2_d0g0v0_Frontier" : {
+    "calldatacopy_dejavu2_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/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa0a4",
-                    "hash" : "0x303af6964d235d5b081bfa9c9e68b52231c1dfd46419c33cfd12efb41de94d46",
-                    "mixHash" : "0x038c7f9710e1cb8412ae2bc6fb9fa874e4927e43a7b4a77d628932d369e234dc",
-                    "nonce" : "0xa5d874378a23aa5c",
+                    "hash" : "0x67351b18974fb15d35d01f106c5e78e97be58d0b2fec7de2a0cb00e201660bd7",
+                    "mixHash" : "0xcb297d23a20824f6290e089a6aa74715d4b574fb82401e00f728591c9812d40e",
+                    "nonce" : "0x7ae7aa4842b946c8",
                     "number" : "0x01",
                     "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
                     "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0038c7f9710e1cb8412ae2bc6fb9fa874e4927e43a7b4a77d628932d369e234dc88a5d874378a23aa5cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0cb297d23a20824f6290e089a6aa74715d4b574fb82401e00f728591c9812d40e887ae7aa4842b946c8f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x303af6964d235d5b081bfa9c9e68b52231c1dfd46419c33cfd12efb41de94d46",
-        "network" : "Frontier",
+        "lastblockhash" : "0x67351b18974fb15d35d01f106c5e78e97be58d0b2fec7de2a0cb00e201660bd7",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "calldatacopy_dejavu2_d0g0v0_Homestead" : {
+    "calldatacopy_dejavu2_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/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa0a4",
-                    "hash" : "0xd30c6f0be7edd585e3b02a885c00caf44d9483265564a9d473b43281828d0e2b",
-                    "mixHash" : "0xeb5c833c77bc32e3943d1be9f71bef185e28f64b6e08550a66ca771e93d32c6e",
-                    "nonce" : "0x72b7d5baecb8d53e",
+                    "hash" : "0x0fa6e16ef9027a05edb7b90871589284adaa1c4b11f101bcb66d5ee509b233f6",
+                    "mixHash" : "0xf1ff91619ec5c3bc9ca12a95270bc6c3d0f37d5277b208b4a7e899e548828961",
+                    "nonce" : "0xb18cd778d2ed1ce2",
                     "number" : "0x01",
                     "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
                     "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0eb5c833c77bc32e3943d1be9f71bef185e28f64b6e08550a66ca771e93d32c6e8872b7d5baecb8d53ef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0f1ff91619ec5c3bc9ca12a95270bc6c3d0f37d5277b208b4a7e899e54882896188b18cd778d2ed1ce2f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd30c6f0be7edd585e3b02a885c00caf44d9483265564a9d473b43281828d0e2b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0fa6e16ef9027a05edb7b90871589284adaa1c4b11f101bcb66d5ee509b233f6",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "calldatacopy_dejavu2_d0g0v0_Metropolis" : {
+    "calldatacopy_dejavu2_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/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa0a4",
-                    "hash" : "0x3e9daff8ab06e59524b79d54f7280e01a506a0ba14295f88d3e679815945e642",
-                    "mixHash" : "0x568c70a3cdb864a80a4dce37e7dd0ab6c1577bcb92fc22926b69d37f1038be33",
-                    "nonce" : "0xe7cbaae0d2458011",
+                    "hash" : "0xffa7abc422d19a54cbce8580d3528ec03808acc3d8dbceb2cb1c817e29a44f18",
+                    "mixHash" : "0xad6fd82370597bae198c52354e85d0e983fb005ddc632327e75593e1936d3107",
+                    "nonce" : "0xeb95c56db327e04b",
                     "number" : "0x01",
                     "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
-                    "receiptTrie" : "0x27ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876e",
-                    "stateRoot" : "0xa969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3",
+                    "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
+                    "stateRoot" : "0xca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a969d5f67b96a8e85482157d24c09565b5c7075c7cd1dc0bd180725037af95f3a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a027ab6b7ebb11802145c0e41204bf1109f3d01142f9f68a14a13dc45f3bbf876eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0568c70a3cdb864a80a4dce37e7dd0ab6c1577bcb92fc22926b69d37f1038be3388e7cbaae0d2458011f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0ad6fd82370597bae198c52354e85d0e983fb005ddc632327e75593e1936d310788eb95c56db327e04bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e9daff8ab06e59524b79d54f7280e01a506a0ba14295f88d3e679815945e642",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xffa7abc422d19a54cbce8580d3528ec03808acc3d8dbceb2cb1c817e29a44f18",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0xff" : "0x0badc0ffee"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a0a4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff5f52",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "calldatacopy_dejavu2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/calldatacopy_dejavu2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xa0a4",
+                    "hash" : "0x643550d594dd75575210993b2d2c41c2176d1c666e568cd043cbe807f6f263d4",
+                    "mixHash" : "0x185a75ef179891bd2a9f0634c01a95414492de38f400a4507cb1e2a39a34ec06",
+                    "nonce" : "0xea73ae6860840b4d",
+                    "number" : "0x01",
+                    "parentHash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
+                    "receiptTrie" : "0x95ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61e",
+                    "stateRoot" : "0xca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f9a02640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca48b1bd07db008d4ba6904ad0fb9d1769909783513657ed1d7db04f053d734fa06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a095ecfcbdbfc56d8f633e2a18be31e93406cfd37b10728ae538451c4e063aa61eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0a48203e880a0185a75ef179891bd2a9f0634c01a95414492de38f400a4507cb1e2a39a34ec0688ea73ae6860840b4df864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x2640bcd03db26ad209f24c4508c34ddfb74660e734cd3468f86d85e5ce0a7723",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c8f25f83945e923239909b99ad69a253d0f5761a4aabfcbd00ecc137ca1ce2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x643550d594dd75575210993b2d2c41c2176d1c666e568cd043cbe807f6f263d4",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu_d0g0v0.json
index 643f2b362..092fac1a1 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/calldatacopy_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "calldatacopy_dejavu_d0g0v0_EIP150" : {
+    "calldatacopy_dejavu_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/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xcca8b274e5be386b1e27521a409d868f75fc9dbcf9cf025d5fed562fd045c211",
-                    "mixHash" : "0x1eb8d417ff347f17996f57ad6e173488ed7568ecd2bdb9ed04ef47ef635f49a5",
-                    "nonce" : "0x2d6a178653b16626",
+                    "hash" : "0x265dd66dcbd78f1cd35635bde24d7bd416dde5915bc7b257beb11be5545e7d03",
+                    "mixHash" : "0x01445386ba4945b17ad761871b95518a4bd68559b55de4dd670bb4545f91cf6a",
+                    "nonce" : "0x0da6ee07215b50fd",
                     "number" : "0x01",
                     "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
-                    "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
-                    "stateRoot" : "0xd2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205b",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x9ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a01eb8d417ff347f17996f57ad6e173488ed7568ecd2bdb9ed04ef47ef635f49a5882d6a178653b16626f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a001445386ba4945b17ad761871b95518a4bd68559b55de4dd670bb4545f91cf6a880da6ee07215b50fdf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcca8b274e5be386b1e27521a409d868f75fc9dbcf9cf025d5fed562fd045c211",
-        "network" : "EIP150",
+        "lastblockhash" : "0x265dd66dcbd78f1cd35635bde24d7bd416dde5915bc7b257beb11be5545e7d03",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff37",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "calldatacopy_dejavu_d0g0v0_EIP158" : {
+    "calldatacopy_dejavu_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/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x5a1dd69f2221624b5c5b114dc7662df944700cfce6a26c8b0cdbefcdccb955d3",
-                    "mixHash" : "0x7e64be404d29ce5b4ec2daf60118259e9bc3b5768ffe8f9be15b0a372842ca5e",
-                    "nonce" : "0x740bb42d8ecc52d0",
+                    "hash" : "0x5e5c2869ea63720b4549c91c5631d76993a44cfc3ae0694977509dd71026b168",
+                    "mixHash" : "0x4fbc944982796d6e503501b9f17681f5da57748789adb2f388497968ffa8f403",
+                    "nonce" : "0x7542f278cb371084",
                     "number" : "0x01",
                     "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
-                    "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
-                    "stateRoot" : "0xd2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205b",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x9ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07e64be404d29ce5b4ec2daf60118259e9bc3b5768ffe8f9be15b0a372842ca5e88740bb42d8ecc52d0f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a04fbc944982796d6e503501b9f17681f5da57748789adb2f388497968ffa8f403887542f278cb371084f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a1dd69f2221624b5c5b114dc7662df944700cfce6a26c8b0cdbefcdccb955d3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5e5c2869ea63720b4549c91c5631d76993a44cfc3ae0694977509dd71026b168",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff37",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "calldatacopy_dejavu_d0g0v0_Frontier" : {
+    "calldatacopy_dejavu_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/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x8e195bd6876addff6a73ed5223b32ed7ebd63c33f5bb91b9b4221b8f56686097",
-                    "mixHash" : "0xc31f608a116a2302a4be0aece03e5aed11f2d6b212b07510d705da282b63b4e1",
-                    "nonce" : "0xb807ec2b6755ea83",
+                    "hash" : "0x5d73e6c82d6c57c57d22d19f1bedddfbbe076480b65f756680ed0e0665b88dd9",
+                    "mixHash" : "0x6b21e00c849fffb515cc7b9dea1c7ebb891d1dcfecac7eabb04e418baf7b7063",
+                    "nonce" : "0x1232c81e9e8a0d84",
                     "number" : "0x01",
                     "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
                     "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c31f608a116a2302a4be0aece03e5aed11f2d6b212b07510d705da282b63b4e188b807ec2b6755ea83f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06b21e00c849fffb515cc7b9dea1c7ebb891d1dcfecac7eabb04e418baf7b7063881232c81e9e8a0d84f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e195bd6876addff6a73ed5223b32ed7ebd63c33f5bb91b9b4221b8f56686097",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5d73e6c82d6c57c57d22d19f1bedddfbbe076480b65f756680ed0e0665b88dd9",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "calldatacopy_dejavu_d0g0v0_Homestead" : {
+    "calldatacopy_dejavu_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/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xb5e376edd549573c9d0ef852bd3b3f6ffca7dae773bb59ef124fe0aa8cfeaef9",
-                    "mixHash" : "0x9f21f26b62e026eb66d413f6429098f91b036751e80e678012bda23090e87356",
-                    "nonce" : "0xabe73105235b4309",
+                    "hash" : "0x09641d799544d8c553a0414de71d074acb52052f91e8deb24a92ac1abcd8385f",
+                    "mixHash" : "0xdc6f811761c0628900d0138564cb3834e5f32f5f5a31ef20e61ed4fbe4979f6c",
+                    "nonce" : "0xb34e242a7b23edad",
                     "number" : "0x01",
                     "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
                     "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09f21f26b62e026eb66d413f6429098f91b036751e80e678012bda23090e8735688abe73105235b4309f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0dc6f811761c0628900d0138564cb3834e5f32f5f5a31ef20e61ed4fbe4979f6c88b34e242a7b23edadf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5e376edd549573c9d0ef852bd3b3f6ffca7dae773bb59ef124fe0aa8cfeaef9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x09641d799544d8c553a0414de71d074acb52052f91e8deb24a92ac1abcd8385f",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "calldatacopy_dejavu_d0g0v0_Metropolis" : {
+    "calldatacopy_dejavu_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/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x77ecfb4c70b9dcf6763ada7b9043843e4299d13ad1b32d003ad4baffe9651e2b",
-                    "mixHash" : "0x1a6aad74acc4562b4468f36ea4ace2ff07e561e91718a357938a8a93853dd110",
-                    "nonce" : "0xef7e46fceefe0a58",
+                    "hash" : "0x6e1ddef67b871d136569193318fd3dcf76c27710a2fb6f353a0e3e12c03886fe",
+                    "mixHash" : "0xd62c564e5aabc74301c318a29ecd422fde2a37f92d0d6d6761b375815bcd5598",
+                    "nonce" : "0x4f494184c7b6d86b",
                     "number" : "0x01",
                     "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0x9ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4",
+                    "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
+                    "stateRoot" : "0xd2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ce4256df8f013ec30d5d5e5ef1012726c2b93c251dcae226840c152561535c4a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a01a6aad74acc4562b4468f36ea4ace2ff07e561e91718a357938a8a93853dd11088ef7e46fceefe0a58f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0d62c564e5aabc74301c318a29ecd422fde2a37f92d0d6d6761b375815bcd5598884f494184c7b6d86bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77ecfb4c70b9dcf6763ada7b9043843e4299d13ad1b32d003ad4baffe9651e2b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6e1ddef67b871d136569193318fd3dcf76c27710a2fb6f353a0e3e12c03886fe",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff37",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff37",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "calldatacopy_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/calldatacopy_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x415bc1c65f74f58e522eba0a13953d86d30b9381217cea2bbd30cb33f024aa66",
+                    "mixHash" : "0xd57a2759758073c20e4016d89f680a63361a8f2d9bf9490e85b70e8df2c7197e",
+                    "nonce" : "0x2ae03b1bcc85ceb8",
+                    "number" : "0x01",
+                    "parentHash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
+                    "receiptTrie" : "0x06a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850f",
+                    "stateRoot" : "0xd2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca08935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d65d52f5e080e02f52563287bd313f3eac584e8c8bde7db785981a2834205ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a006a3ba28d727339f0f060d6380d4e704d9d6ddf494d4ee270c5cbaebbcb7850fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0d57a2759758073c20e4016d89f680a63361a8f2d9bf9490e85b70e8df2c7197e882ae03b1bcc85ceb8f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8935c64ffb19f715087d6186aa63cb97b6edaf7ca78bede412d6f0cb8f392834",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c67d0b60d759bc2528c31a0049edfcf95cceeb2b1d293b191a97d67934aa7e04a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x415bc1c65f74f58e522eba0a13953d86d30b9381217cea2bbd30cb33f024aa66",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff37",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu2_d0g0v0.json
index 7798b9f4c..2d414cd2f 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "codecopy_dejavu2_d0g0v0_EIP150" : {
+    "codecopy_dejavu2_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/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x5246",
-                    "hash" : "0x24aba99b2a2b933076b302040535864d431429ae5c622ded18e6bc160e821489",
-                    "mixHash" : "0x0419c2898a798ae26f3a46e39dd56d5e0fde684737b9bf97a07784e1fb9244c0",
-                    "nonce" : "0x5fec737aca869b45",
+                    "hash" : "0x49f24ae4566b2b6c953b8d2f7053dd9160668103053344a22ae03f044968ef23",
+                    "mixHash" : "0x4c76e96c50c81d5b84e726e8266ab23b8ee91fe9f527c077a4e393cddde20213",
+                    "nonce" : "0x560c739b602334af",
                     "number" : "0x01",
                     "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
-                    "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
-                    "stateRoot" : "0xc47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5",
+                    "receiptTrie" : "0xa1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ce",
+                    "stateRoot" : "0x674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a00419c2898a798ae26f3a46e39dd56d5e0fde684737b9bf97a07784e1fb9244c0885fec737aca869b45f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0a1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a04c76e96c50c81d5b84e726e8266ab23b8ee91fe9f527c077a4e393cddde2021388560c739b602334aff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24aba99b2a2b933076b302040535864d431429ae5c622ded18e6bc160e821489",
-        "network" : "EIP150",
+        "lastblockhash" : "0x49f24ae4566b2b6c953b8d2f7053dd9160668103053344a22ae03f044968ef23",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "codecopy_dejavu2_d0g0v0_EIP158" : {
+    "codecopy_dejavu2_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/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x5246",
-                    "hash" : "0x44c7ba544d1942d2e702cb23f99f6ae925cf6a3618b0b01c5eff792e6efec6c1",
-                    "mixHash" : "0x686be5248dc8a5ffb42c85940647a51ce87971c8c288b2662a3de16609299176",
-                    "nonce" : "0xc38b49d55e5e352f",
+                    "hash" : "0x9f51a4637e38ae9388456d0e4cb6e29579b4c1dc7bd5c58a9e6feedc1103208e",
+                    "mixHash" : "0x52a18988b4f636481abe6cc4967bfc496cabb7bfcb0ff0bd3e81c56ad242399b",
+                    "nonce" : "0xc9b0bf5a4466e778",
                     "number" : "0x01",
                     "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
-                    "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
-                    "stateRoot" : "0xc47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5",
+                    "receiptTrie" : "0xa1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ce",
+                    "stateRoot" : "0x674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a0686be5248dc8a5ffb42c85940647a51ce87971c8c288b2662a3de1660929917688c38b49d55e5e352ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0a1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a052a18988b4f636481abe6cc4967bfc496cabb7bfcb0ff0bd3e81c56ad242399b88c9b0bf5a4466e778f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44c7ba544d1942d2e702cb23f99f6ae925cf6a3618b0b01c5eff792e6efec6c1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9f51a4637e38ae9388456d0e4cb6e29579b4c1dc7bd5c58a9e6feedc1103208e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "codecopy_dejavu2_d0g0v0_Frontier" : {
+    "codecopy_dejavu2_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/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x5246",
-                    "hash" : "0x016e0950fec45633df3af6b21020a1640989de404cbe3f5fecce4b0e2c151863",
-                    "mixHash" : "0xfc204fc6a3c950694608d591248cce56c46e5c35a5d31448d57b2e28a97115a4",
-                    "nonce" : "0x94abb0ada2476a51",
+                    "hash" : "0xfc0884fc98d478b91e6822971a0689a959a92678c2178e5325da8e297a8e80fc",
+                    "mixHash" : "0x11d8224fb315d46bac7cdbc20d2c2626532a2f5bc9c6e1601421a4a00477f709",
+                    "nonce" : "0x8f81a2eb78eeb869",
                     "number" : "0x01",
                     "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
                     "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a0fc204fc6a3c950694608d591248cce56c46e5c35a5d31448d57b2e28a97115a48894abb0ada2476a51f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a011d8224fb315d46bac7cdbc20d2c2626532a2f5bc9c6e1601421a4a00477f709888f81a2eb78eeb869f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x016e0950fec45633df3af6b21020a1640989de404cbe3f5fecce4b0e2c151863",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfc0884fc98d478b91e6822971a0689a959a92678c2178e5325da8e297a8e80fc",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "codecopy_dejavu2_d0g0v0_Homestead" : {
+    "codecopy_dejavu2_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/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x5246",
-                    "hash" : "0x04b1ba9670f2c465f2e8d509558e4f370880dc39a793fb67b93cbe75d744da16",
-                    "mixHash" : "0x4ccb859ebc37804c6110d7f58d6ac50a019b7e89186746dba27fc490bf8f8f96",
-                    "nonce" : "0x3bce06d05371988f",
+                    "hash" : "0x98ebca1f3061577d2deecaa2b97785a08ec8451c7a84ac19f51299187ccc4d8b",
+                    "mixHash" : "0xcf22d75d8d3fe0c046852339de7aa68b67f495179314db140b667db4f5ffe3e3",
+                    "nonce" : "0x4177564ef690781c",
                     "number" : "0x01",
                     "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
                     "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a04ccb859ebc37804c6110d7f58d6ac50a019b7e89186746dba27fc490bf8f8f96883bce06d05371988ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a0cf22d75d8d3fe0c046852339de7aa68b67f495179314db140b667db4f5ffe3e3884177564ef690781cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04b1ba9670f2c465f2e8d509558e4f370880dc39a793fb67b93cbe75d744da16",
-        "network" : "Homestead",
+        "lastblockhash" : "0x98ebca1f3061577d2deecaa2b97785a08ec8451c7a84ac19f51299187ccc4d8b",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "codecopy_dejavu2_d0g0v0_Metropolis" : {
+    "codecopy_dejavu2_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/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x5246",
-                    "hash" : "0x38235102138b4501330cf726dc51243b2a252b27b45b655d492434c0b0da0421",
-                    "mixHash" : "0x71329edc582890d895c0bdfdae7b18fd5ac4e6277cfd119c2197c8996f1f2839",
-                    "nonce" : "0x695cef8ea02a7496",
+                    "hash" : "0xe1166116e392527addd6145105e9be7a5ffdf955ca937f8f86879e9c718a0462",
+                    "mixHash" : "0xc3f5a5bbbdb0b90b713694f956630ec4cd5273f51863101052a575a33ff09a90",
+                    "nonce" : "0xbd8babd39dffce82",
                     "number" : "0x01",
                     "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
-                    "receiptTrie" : "0xa1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ce",
-                    "stateRoot" : "0x674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171",
+                    "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
+                    "stateRoot" : "0xc47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674b5fb58fb40c22d71f98314fe8dbfe971a148536b07b0c20facb0741af4171a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0a1907a196b9c51603241fc723e7f86206fb80348efda5807e96b4be955baf7ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a071329edc582890d895c0bdfdae7b18fd5ac4e6277cfd119c2197c8996f1f283988695cef8ea02a7496f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a0c3f5a5bbbdb0b90b713694f956630ec4cd5273f51863101052a575a33ff09a9088bd8babd39dffce82f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38235102138b4501330cf726dc51243b2a252b27b45b655d492434c0b0da0421",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe1166116e392527addd6145105e9be7a5ffdf955ca937f8f86879e9c718a0462",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45246",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffffadb0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "codecopy_dejavu2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/codecopy_dejavu2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x5246",
+                    "hash" : "0xaff0ddcdc47fa8e570e7fc7e64d6c50911737bebe4b9b3f2f95fef82864a3386",
+                    "mixHash" : "0xfde37049d17e4b28ec66555ee634ac25497303b891b870df83ab0fd47a89ec74",
+                    "nonce" : "0xca924c09d625612f",
+                    "number" : "0x01",
+                    "parentHash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
+                    "receiptTrie" : "0x393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457",
+                    "stateRoot" : "0xc47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f9a026f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c47270ef9f5f66430906304807b9cabcf9f00efb1b4693243f63516d42b5d2e5a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0393d415cec5e8686e12145b1962f6ce5e24bb80e61931243be7d7de7bb6c7457b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008252468203e880a0fde37049d17e4b28ec66555ee634ac25497303b891b870df83ab0fd47a89ec7488ca924c09d625612ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x26f86034ee1eb809187ea75489ecbbb14b62e9d6f8658a8b3851fa20f2ea8906",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018f9f7900edc2f66f1ffa87cc2b647c31e5bda6a1e1c51217a3ea97d08a844a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaff0ddcdc47fa8e570e7fc7e64d6c50911737bebe4b9b3f2f95fef82864a3386",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu_d0g0v0.json
index d5704ccb6..791189880 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/codecopy_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "codecopy_dejavu_d0g0v0_EIP150" : {
+    "codecopy_dejavu_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/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x857067eb72931a192331c1b805df3dc289172ae36645d127dd434836e43e456e",
-                    "mixHash" : "0xe119f4b5dbc4d33922e340ce6b1b2829cea4759b3b2b7d649cb3b72593830eb2",
-                    "nonce" : "0x3ca0f258a1eee73e",
+                    "hash" : "0x7af70a11a7a48af7a0c983043a2062c2e4c89a068439e0b60e529411032f5cd2",
+                    "mixHash" : "0x773930fab9a0b7795f630f4c6b436931275e1e52a89adfdf16d325894582c21a",
+                    "nonce" : "0xdacac51c9ba16603",
                     "number" : "0x01",
                     "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
-                    "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
-                    "stateRoot" : "0xd44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42c",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x1671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e119f4b5dbc4d33922e340ce6b1b2829cea4759b3b2b7d649cb3b72593830eb2883ca0f258a1eee73ef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0773930fab9a0b7795f630f4c6b436931275e1e52a89adfdf16d325894582c21a88dacac51c9ba16603f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x857067eb72931a192331c1b805df3dc289172ae36645d127dd434836e43e456e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7af70a11a7a48af7a0c983043a2062c2e4c89a068439e0b60e529411032f5cd2",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff39",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "codecopy_dejavu_d0g0v0_EIP158" : {
+    "codecopy_dejavu_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/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xb72e76c9d5b0b2087e608e3dadcfdafe5d490e9f0a74801769959f963749e471",
-                    "mixHash" : "0x6eb4a122763ce465fcd97a4b5a35cb2d676ed555a5c3094bb69ef69fef7e5c9c",
-                    "nonce" : "0x8660771f82ca0366",
+                    "hash" : "0x33bf01bada680f08725f9c2af445085ceaba498e7194ab1146c81d793b2be530",
+                    "mixHash" : "0x7444836bc531ebddf7b22e5cd0f18bca1c8cab7758debc6b9e77c1797dde2b03",
+                    "nonce" : "0xc18536bb38bbf18c",
                     "number" : "0x01",
                     "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
-                    "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
-                    "stateRoot" : "0xd44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42c",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x1671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06eb4a122763ce465fcd97a4b5a35cb2d676ed555a5c3094bb69ef69fef7e5c9c888660771f82ca0366f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07444836bc531ebddf7b22e5cd0f18bca1c8cab7758debc6b9e77c1797dde2b0388c18536bb38bbf18cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb72e76c9d5b0b2087e608e3dadcfdafe5d490e9f0a74801769959f963749e471",
-        "network" : "EIP158",
+        "lastblockhash" : "0x33bf01bada680f08725f9c2af445085ceaba498e7194ab1146c81d793b2be530",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff39",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "codecopy_dejavu_d0g0v0_Frontier" : {
+    "codecopy_dejavu_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/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x2ea3b585b3b6ff28e329f1818d84f2b0470cdc7c7ecab0ce1ff0ab8fa3c29a23",
-                    "mixHash" : "0x8fc2591234c8b982f88106d7f727250053f3dc8b519e9061bc2fbea0ad8f26d3",
-                    "nonce" : "0x58338ad11bd88870",
+                    "hash" : "0xcb6caf2124e9f57689c1bf78eb50522df5f61ab36fe22dad0f3094bd38d3c6ee",
+                    "mixHash" : "0x61ddc2ea8cb4971c2423355b6aa97e5cc28c811a36085ef9263a101dfe420fb1",
+                    "nonce" : "0x9d25a159f16e4cf2",
                     "number" : "0x01",
                     "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
                     "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a08fc2591234c8b982f88106d7f727250053f3dc8b519e9061bc2fbea0ad8f26d38858338ad11bd88870f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a061ddc2ea8cb4971c2423355b6aa97e5cc28c811a36085ef9263a101dfe420fb1889d25a159f16e4cf2f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ea3b585b3b6ff28e329f1818d84f2b0470cdc7c7ecab0ce1ff0ab8fa3c29a23",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcb6caf2124e9f57689c1bf78eb50522df5f61ab36fe22dad0f3094bd38d3c6ee",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "codecopy_dejavu_d0g0v0_Homestead" : {
+    "codecopy_dejavu_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/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x014c24721ea3faea2aa7a58922093d16a45d89138951d87912b73a056a49994b",
-                    "mixHash" : "0xb91335033942b7bdaa77a2466b8d9d78513a2ac8c4f03b64a96b160f74c69d8b",
-                    "nonce" : "0x92382b2b558764a0",
+                    "hash" : "0x8bacd6133268d842ed864f2e16af88edd3fd4afd9fffaf2835fb3dc8579dd641",
+                    "mixHash" : "0x214c61019f71d40c7c5b1eec8118c6835a6063dc81c5b80693e86a78ef71b6ff",
+                    "nonce" : "0x92c881e2dce27c30",
                     "number" : "0x01",
                     "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
                     "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0b91335033942b7bdaa77a2466b8d9d78513a2ac8c4f03b64a96b160f74c69d8b8892382b2b558764a0f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0214c61019f71d40c7c5b1eec8118c6835a6063dc81c5b80693e86a78ef71b6ff8892c881e2dce27c30f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x014c24721ea3faea2aa7a58922093d16a45d89138951d87912b73a056a49994b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8bacd6133268d842ed864f2e16af88edd3fd4afd9fffaf2835fb3dc8579dd641",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "codecopy_dejavu_d0g0v0_Metropolis" : {
+    "codecopy_dejavu_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/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x0824ba88a1846f28efaf43502e16906c347b38cf563bc23ea9c99a8751e3ef95",
-                    "mixHash" : "0x774f1d15a0fa7b457d842c6686e76a25c75e25f31e549f10584caf90dfcd9a4f",
-                    "nonce" : "0x47ad1f4e702e5af8",
+                    "hash" : "0x3adcedaf0cbe347d13287e816e043b5008581ba48293b51cf0e727f5833ec6e0",
+                    "mixHash" : "0x1df3614122f8a4e4ddf0091139d3d649858243874fd8739aebb4bbb8480240b7",
+                    "nonce" : "0x3d3e59875d2da3c9",
                     "number" : "0x01",
                     "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0x1671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6",
+                    "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
+                    "stateRoot" : "0xd44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01671d9a3017cd3eaf7c5f80cd06fa4bec56d4c1d6f4249d37eec2811b60d04b6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0774f1d15a0fa7b457d842c6686e76a25c75e25f31e549f10584caf90dfcd9a4f8847ad1f4e702e5af8f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a01df3614122f8a4e4ddf0091139d3d649858243874fd8739aebb4bbb8480240b7883d3e59875d2da3c9f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0824ba88a1846f28efaf43502e16906c347b38cf563bc23ea9c99a8751e3ef95",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3adcedaf0cbe347d13287e816e043b5008581ba48293b51cf0e727f5833ec6e0",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff39",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff39",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "codecopy_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/codecopy_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x670bf8f10ff6daae00af0f71eb2acd82693fea9154ddb9dfb7711109636ebc02",
+                    "mixHash" : "0x659ea25c1f86c40094c4236715adc5977373c87f89c8c5bb37b5b37e4927c90c",
+                    "nonce" : "0x22e5e2c6a440b5cc",
+                    "number" : "0x01",
+                    "parentHash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
+                    "receiptTrie" : "0x0b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947",
+                    "stateRoot" : "0xd44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0ef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44e29c37aff06a3bc2a6551c2ec6f07bae903c1db2ccc25e2e98f092311e42ca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a00b50b7a1bc07bb6c2e0d1c987eef8175c88206d1e24557ded2c82069c72f1947b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0659ea25c1f86c40094c4236715adc5977373c87f89c8c5bb37b5b37e4927c90c8822e5e2c6a440b5ccf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xef4bc5ecef0a0639586ac0fa0234557e0977c60c977e3fe6cbc8df15de3ed07c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2ba",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4bc1f96f9d2d0b96eef2051f8f6e7523984d2fbe5ae7c665c61d695eef8a2baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x670bf8f10ff6daae00af0f71eb2acd82693fea9154ddb9dfb7711109636ebc02",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff39",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/extcodecopy_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/extcodecopy_dejavu_d0g0v0.json
index 5830d1264..dc5dbf6de 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/extcodecopy_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/extcodecopy_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "extcodecopy_dejavu_d0g0v0_EIP150" : {
+    "extcodecopy_dejavu_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/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x7ff6911be487898ea7f45208d9bc8d446788ce23c19c18546e02056340a66cc3",
-                    "mixHash" : "0xfa15be865ff2ee2d8ed7074eac79866fdadee2a8eaa5e190d6385f68aad2b9c0",
-                    "nonce" : "0x95c37d05e7cd1f74",
+                    "hash" : "0x8b2914a2fc16f9dfff145772109381513a228b8ad7754115d1de5af478569587",
+                    "mixHash" : "0x51a8b9da1e3f235416081b3cac9854d1cd679c7358a73280f3ada457914358ec",
+                    "nonce" : "0x59f6a65ade490dae",
                     "number" : "0x01",
                     "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
-                    "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
-                    "stateRoot" : "0x15584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xdd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0fa15be865ff2ee2d8ed7074eac79866fdadee2a8eaa5e190d6385f68aad2b9c08895c37d05e7cd1f74f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2eea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a051a8b9da1e3f235416081b3cac9854d1cd679c7358a73280f3ada457914358ec8859f6a65ade490daef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ff6911be487898ea7f45208d9bc8d446788ce23c19c18546e02056340a66cc3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8b2914a2fc16f9dfff145772109381513a228b8ad7754115d1de5af478569587",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff3c",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "extcodecopy_dejavu_d0g0v0_EIP158" : {
+    "extcodecopy_dejavu_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/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xcb5843248526ad48377fa26964c0accc7e97941c04c6960a6d2383c01f13ed59",
-                    "mixHash" : "0x7186514516cf4c5d6ba8d023d1c6fdb3cbce28d789432bc2ec4145c9009c2ac8",
-                    "nonce" : "0x714617b3e80cbb1c",
+                    "hash" : "0xe75e8ecc1bd089c5c4da2e70f5a3349c6bf23fa4f4d4ea1a2acf4e2b355163e0",
+                    "mixHash" : "0x8654dcb054948ac2e95565c4196145b37a1189442a6804563ae4dc0eee8b2448",
+                    "nonce" : "0xef9e9ecd1268e874",
                     "number" : "0x01",
                     "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
-                    "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
-                    "stateRoot" : "0x15584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xdd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07186514516cf4c5d6ba8d023d1c6fdb3cbce28d789432bc2ec4145c9009c2ac888714617b3e80cbb1cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2eea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a08654dcb054948ac2e95565c4196145b37a1189442a6804563ae4dc0eee8b244888ef9e9ecd1268e874f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb5843248526ad48377fa26964c0accc7e97941c04c6960a6d2383c01f13ed59",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe75e8ecc1bd089c5c4da2e70f5a3349c6bf23fa4f4d4ea1a2acf4e2b355163e0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff3c",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "extcodecopy_dejavu_d0g0v0_Frontier" : {
+    "extcodecopy_dejavu_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/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xd4d1e10f124cb1dd71ab272c53b0610aae0d49ea0b76627fecefced47f553d0e",
-                    "mixHash" : "0x622cea5a06a4b20a3608b4d8221949f4b6309d27c461517fba7da4179e892473",
-                    "nonce" : "0xc750984a4776df17",
+                    "hash" : "0x519c88fb7699c8c9771bc9e54daf58be3e8380eda149cd7bcc674b5e4c3e60c7",
+                    "mixHash" : "0x21e172e821c96763a9bec1eec92a217d01632defa893c42184d1e30ef0d29cdc",
+                    "nonce" : "0x03681be3c12ebb02",
                     "number" : "0x01",
                     "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
                     "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0622cea5a06a4b20a3608b4d8221949f4b6309d27c461517fba7da4179e89247388c750984a4776df17f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a021e172e821c96763a9bec1eec92a217d01632defa893c42184d1e30ef0d29cdc8803681be3c12ebb02f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4d1e10f124cb1dd71ab272c53b0610aae0d49ea0b76627fecefced47f553d0e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x519c88fb7699c8c9771bc9e54daf58be3e8380eda149cd7bcc674b5e4c3e60c7",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "extcodecopy_dejavu_d0g0v0_Homestead" : {
+    "extcodecopy_dejavu_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/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x88b99a64b2a4d1a7e6315b77e23b6b7eff54357f665bf0a8e6e90f70680d0884",
-                    "mixHash" : "0x28326832551ceec6f7945b58dfd749358dbe1133485cac57563300dc2d95b719",
-                    "nonce" : "0xf921522def127435",
+                    "hash" : "0x462c76be91347f2c499b937bdc13833c823519a3bdd3711bf0ab9fa0501cf4c0",
+                    "mixHash" : "0xfdae8e39b64e11940067351d61b12c82cdb4a53e4108eb64f63b6d3be31256f8",
+                    "nonce" : "0x52e419738395830c",
                     "number" : "0x01",
                     "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
                     "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a028326832551ceec6f7945b58dfd749358dbe1133485cac57563300dc2d95b71988f921522def127435f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0fdae8e39b64e11940067351d61b12c82cdb4a53e4108eb64f63b6d3be31256f88852e419738395830cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88b99a64b2a4d1a7e6315b77e23b6b7eff54357f665bf0a8e6e90f70680d0884",
-        "network" : "Homestead",
+        "lastblockhash" : "0x462c76be91347f2c499b937bdc13833c823519a3bdd3711bf0ab9fa0501cf4c0",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "extcodecopy_dejavu_d0g0v0_Metropolis" : {
+    "extcodecopy_dejavu_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/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xa6695ec14d9fa89607f0e8df2fd540d977d2dc6b7b39de8d03416bf9b0e6a209",
-                    "mixHash" : "0xdfe289faf27ecc1b6dcc300be558769046daf9a7eb671d655d24e0ca69347655",
-                    "nonce" : "0x56063ff14e0374aa",
+                    "hash" : "0xf7815b4cb3939238d5490c4780727e579543b9627a0849651c3f01d0a02c15a8",
+                    "mixHash" : "0x80b2d0cc3452ef523ba9069f4b44894e0ce72e6fe94273bb6f75491f209f78e8",
+                    "nonce" : "0x356731bb9cb779b0",
                     "number" : "0x01",
                     "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xdd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2ee",
+                    "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
+                    "stateRoot" : "0x15584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd5696ca462551757210d88a6434c7e9acb0f5bc68121feffb862d33a6b6b2eea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0dfe289faf27ecc1b6dcc300be558769046daf9a7eb671d655d24e0ca693476558856063ff14e0374aaf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a080b2d0cc3452ef523ba9069f4b44894e0ce72e6fe94273bb6f75491f209f78e888356731bb9cb779b0f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6695ec14d9fa89607f0e8df2fd540d977d2dc6b7b39de8d03416bf9b0e6a209",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf7815b4cb3939238d5490c4780727e579543b9627a0849651c3f01d0a02c15a8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff3c",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffff630fffffff3c",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "extcodecopy_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/extcodecopy_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x8528ef61936afc0ea2e2be8e03fbe391af4b141cb90b1311b968f54287dcc12f",
+                    "mixHash" : "0xc1f0e9ba692e9f4fb290f0498478f98adcf44d46044062978b161dce8d7deae5",
+                    "nonce" : "0xe697cfa2cb1a5877",
+                    "number" : "0x01",
+                    "parentHash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
+                    "receiptTrie" : "0x29905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02",
+                    "stateRoot" : "0x15584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015584ba8151d046c348bdf9dfc0045fe26b74d79901054b5d580b0f7a7654eb8a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a029905be881d46e8ce84c63378cbedae2c14dc21ef037f89d9fe781f253559f02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c1f0e9ba692e9f4fb290f0498478f98adcf44d46044062978b161dce8d7deae588e697cfa2cb1a5877f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x836494c900ee072389621b2e50fe3219479eec758fbc905bcacaa783923fbc61",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a03ba5f85a30681cf2509a2cd54a00535d8fabf0c50137348080ae62c3ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8528ef61936afc0ea2e2be8e03fbe391af4b141cb90b1311b968f54287dcc12f",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff3c",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/log1_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/log1_dejavu_d0g0v0.json
index df30ad544..4788ca2f0 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/log1_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/log1_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "log1_dejavu_d0g0v0_EIP150" : {
+    "log1_dejavu_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/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xd63bc6c55d95e4d919e5f7d388918aef2c812c42929bbf760dc467c75c77f444",
-                    "mixHash" : "0x78d3f8dda669c419adce31805e53394022908472705fc3f35b76f59de31f1741",
-                    "nonce" : "0x00bee4ad4e2e4db3",
+                    "hash" : "0x0ac230e3ec195d2ca5ff97559051503da3b26bb80a05651bbb78c16ed43b7247",
+                    "mixHash" : "0xe0a29ddc9306854ed2a94785390a898b6871ba7e6ea3562d05e8c488f7230e6c",
+                    "nonce" : "0x0ee00f0a530f345a",
                     "number" : "0x01",
                     "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
-                    "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
-                    "stateRoot" : "0x5632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a078d3f8dda669c419adce31805e53394022908472705fc3f35b76f59de31f17418800bee4ad4e2e4db3f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4eca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e0a29ddc9306854ed2a94785390a898b6871ba7e6ea3562d05e8c488f7230e6c880ee00f0a530f345af864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd63bc6c55d95e4d919e5f7d388918aef2c812c42929bbf760dc467c75c77f444",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0ac230e3ec195d2ca5ff97559051503da3b26bb80a05651bbb78c16ed43b7247",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa1",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "log1_dejavu_d0g0v0_EIP158" : {
+    "log1_dejavu_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/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x69a10083814dd76ac09c07cae31644d993857390255dc1f1b672297b241b942b",
-                    "mixHash" : "0x08e9d708bd94eff0de6ca1260c0869e1bff8e40aecf9f04ca09523687f1226b1",
-                    "nonce" : "0x947c5166aa48f70d",
+                    "hash" : "0x941b446adbb84aaeb11d29df3b438e05a582db0a22ca4b5e894deca3bc80cf16",
+                    "mixHash" : "0x8fa3f0c399f2ac6abd168c8da9e9500c239f3e6eb0ae0e6e839dac852095ed15",
+                    "nonce" : "0x86540977b1040c39",
                     "number" : "0x01",
                     "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
-                    "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
-                    "stateRoot" : "0x5632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a008e9d708bd94eff0de6ca1260c0869e1bff8e40aecf9f04ca09523687f1226b188947c5166aa48f70df864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4eca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a08fa3f0c399f2ac6abd168c8da9e9500c239f3e6eb0ae0e6e839dac852095ed158886540977b1040c39f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69a10083814dd76ac09c07cae31644d993857390255dc1f1b672297b241b942b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x941b446adbb84aaeb11d29df3b438e05a582db0a22ca4b5e894deca3bc80cf16",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa1",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "log1_dejavu_d0g0v0_Frontier" : {
+    "log1_dejavu_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/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x482e108a11d18f664b67d47aba37abdbbf6bd584e5806bc077aa3857fded004b",
-                    "mixHash" : "0xe4e478f7182c5c79e28df2a28d139e2270f942a45e2d113fd97ccfd12cdeeaec",
-                    "nonce" : "0x3d07bf0eca8ca778",
+                    "hash" : "0x5e9069c2bbce4b94df9446f73d8f83084faeab9eb22b2414802eec229c8c742b",
+                    "mixHash" : "0x74934ecd6a78853ebfba3d8b408aa4bd3bbd379158baa012ca2ce5b08eb71183",
+                    "nonce" : "0xb4c7a06a7590c1ad",
                     "number" : "0x01",
                     "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
                     "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e4e478f7182c5c79e28df2a28d139e2270f942a45e2d113fd97ccfd12cdeeaec883d07bf0eca8ca778f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a074934ecd6a78853ebfba3d8b408aa4bd3bbd379158baa012ca2ce5b08eb7118388b4c7a06a7590c1adf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x482e108a11d18f664b67d47aba37abdbbf6bd584e5806bc077aa3857fded004b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e9069c2bbce4b94df9446f73d8f83084faeab9eb22b2414802eec229c8c742b",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "log1_dejavu_d0g0v0_Homestead" : {
+    "log1_dejavu_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/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x45576753b6b647df658cf8eb60d1f0a589deefc579673d5fd0150e0ff533cb08",
-                    "mixHash" : "0x54eca0167a2c5492ada4e1efa8161eeabbf6d0948a3abac10c1dcacd38093e39",
-                    "nonce" : "0xc6497e88803a0895",
+                    "hash" : "0x6a19d6635f31c391e86accdbf14dd62f23ee2aa5d6611dcd9ce967a83973aef0",
+                    "mixHash" : "0x9dbe3b5ba0c0debf14f5be906e11e0ef36acdc3cdb6e53c5a25de9da7faa9712",
+                    "nonce" : "0x536fc2e55846f40f",
                     "number" : "0x01",
                     "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
                     "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a054eca0167a2c5492ada4e1efa8161eeabbf6d0948a3abac10c1dcacd38093e3988c6497e88803a0895f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09dbe3b5ba0c0debf14f5be906e11e0ef36acdc3cdb6e53c5a25de9da7faa971288536fc2e55846f40ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45576753b6b647df658cf8eb60d1f0a589deefc579673d5fd0150e0ff533cb08",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6a19d6635f31c391e86accdbf14dd62f23ee2aa5d6611dcd9ce967a83973aef0",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "log1_dejavu_d0g0v0_Metropolis" : {
+    "log1_dejavu_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/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x975994c3ca7f53790c47138d098a62afc69dd6790b6f7c972ecc70f7a654fcd0",
-                    "mixHash" : "0x04a69b29a4f5a0a2c1504e932835b663a6425e2a2763e36aaa606618bdd3f555",
-                    "nonce" : "0xb8cd11f56d2f76d6",
+                    "hash" : "0x2491aabcb659202e568557c98903e07529e85cb0dfc97f37745714375ae6850f",
+                    "mixHash" : "0xb84fe38557ca083b0dc7188fe3c961495efd5e848f1bac307df14483bec58f25",
+                    "nonce" : "0xf7e9fdb7703a3e91",
                     "number" : "0x01",
                     "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0x555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4ec",
+                    "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
+                    "stateRoot" : "0x5632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0555bc117be82c68697609684d4a204a08b96fe5627974c94e821d7ad15ace4eca06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a004a69b29a4f5a0a2c1504e932835b663a6425e2a2763e36aaa606618bdd3f55588b8cd11f56d2f76d6f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0b84fe38557ca083b0dc7188fe3c961495efd5e848f1bac307df14483bec58f2588f7e9fdb7703a3e91f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x975994c3ca7f53790c47138d098a62afc69dd6790b6f7c972ecc70f7a654fcd0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2491aabcb659202e568557c98903e07529e85cb0dfc97f37745714375ae6850f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffffa1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffffa1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "log1_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/log1_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x55ac71950f24a573489fc438485fe978897d6c4a3b593fddb9ec2cceec367ef2",
+                    "mixHash" : "0x7bd56c04125a3bad2949991b4f638c8d908ef036e3d21dc10c677e0561e342e8",
+                    "nonce" : "0x4c79f8b4096bb2a5",
+                    "number" : "0x01",
+                    "parentHash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
+                    "receiptTrie" : "0x76f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002ab",
+                    "stateRoot" : "0x5632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca092bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05632722fb0255bf96f111d73d979a811d83cf62d6cbb372091652e5dd2848879a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a076f2c37d5f47b668e87afe61effbfba2a109cb67cc635b4f3426aa1d27d002abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07bd56c04125a3bad2949991b4f638c8d908ef036e3d21dc10c677e0561e342e8884c79f8b4096bb2a5f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x92bb84fac5067350239657d58ec485b991c6d5805d0ddf2ac266c902ca51e4e7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb1fb0c27bfcb64197bb5951fdeee585e9027bf6ed3e461b8b81c159cd7ecbbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x55ac71950f24a573489fc438485fe978897d6c4a3b593fddb9ec2cceec367ef2",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa1",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/log2_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/log2_dejavu_d0g0v0.json
index 40dff7026..ade09bf7a 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/log2_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/log2_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "log2_dejavu_d0g0v0_EIP150" : {
+    "log2_dejavu_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/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xcfeb42a43887f36b52e95ca5138694ff3a438a325e72d329ff55781ef2ca7758",
-                    "mixHash" : "0x33896fbd62e738e6aa8b305514ca0f4a7b5186b1bb86cb4af2646c148be6b5a8",
-                    "nonce" : "0xda8e267a32915185",
+                    "hash" : "0xa49dfec00f5fdbd4c56f939800b4c010214d6d8cbb6ce89e51a04cfbac6b70d4",
+                    "mixHash" : "0x6a872f871d23d7857f629398e1ccc170253ef4fb03177a116917717d3aed5c10",
+                    "nonce" : "0x44415bda88cc36f6",
                     "number" : "0x01",
                     "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
-                    "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
-                    "stateRoot" : "0xf43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a033896fbd62e738e6aa8b305514ca0f4a7b5186b1bb86cb4af2646c148be6b5a888da8e267a32915185f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06a872f871d23d7857f629398e1ccc170253ef4fb03177a116917717d3aed5c108844415bda88cc36f6f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfeb42a43887f36b52e95ca5138694ff3a438a325e72d329ff55781ef2ca7758",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa49dfec00f5fdbd4c56f939800b4c010214d6d8cbb6ce89e51a04cfbac6b70d4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa2",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "log2_dejavu_d0g0v0_EIP158" : {
+    "log2_dejavu_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/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x31bdfd9d89cfa0194f64a25822f29314e904386e6a66d687750ed54546e38e53",
-                    "mixHash" : "0x9ce30bc619832b8f251641fc8d5b90ffb79f9908496436e77e0902e4ee1bf6cf",
-                    "nonce" : "0xd08e9a63676e1db4",
+                    "hash" : "0x204e13ecff4a884ddd86529de44bbf56c90f387606e18b45330fdc7faa4f5737",
+                    "mixHash" : "0xbe4cb746e8a0e4c3500ae80d2d6616f77520538c00fb5958585b19ea97627a87",
+                    "nonce" : "0xcdad256be0012e0d",
                     "number" : "0x01",
                     "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
-                    "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
-                    "stateRoot" : "0xf43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09ce30bc619832b8f251641fc8d5b90ffb79f9908496436e77e0902e4ee1bf6cf88d08e9a63676e1db4f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0be4cb746e8a0e4c3500ae80d2d6616f77520538c00fb5958585b19ea97627a8788cdad256be0012e0df864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31bdfd9d89cfa0194f64a25822f29314e904386e6a66d687750ed54546e38e53",
-        "network" : "EIP158",
+        "lastblockhash" : "0x204e13ecff4a884ddd86529de44bbf56c90f387606e18b45330fdc7faa4f5737",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa2",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "log2_dejavu_d0g0v0_Frontier" : {
+    "log2_dejavu_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/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xa00d4b28cb4101ccb447750b7852d0128c55b3b0c7f5645275b17dc35bc0ffa2",
-                    "mixHash" : "0xf91e650fc646c914d15556a9393684df2144ee7e42379a63c20a4505a31e0fb3",
-                    "nonce" : "0x9377e9821e98994a",
+                    "hash" : "0xc9bf806f41ba5026c490bffee30f0854000b28a10aa80605a054d57e04aa8d9a",
+                    "mixHash" : "0xe601d77ee24e1b42847102e888dc263ffcce380f2d253169b099538655454812",
+                    "nonce" : "0xa0a0950ca5a8c5c8",
                     "number" : "0x01",
                     "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
                     "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f91e650fc646c914d15556a9393684df2144ee7e42379a63c20a4505a31e0fb3889377e9821e98994af864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e601d77ee24e1b42847102e888dc263ffcce380f2d253169b09953865545481288a0a0950ca5a8c5c8f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa00d4b28cb4101ccb447750b7852d0128c55b3b0c7f5645275b17dc35bc0ffa2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc9bf806f41ba5026c490bffee30f0854000b28a10aa80605a054d57e04aa8d9a",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "log2_dejavu_d0g0v0_Homestead" : {
+    "log2_dejavu_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/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x2c59d752aec85e23b8565a9ce8be3076e4477ee2820d1fe7ae849f62a6ce9019",
-                    "mixHash" : "0x5366b0c7e3746fd63f028ff56bcb1704707c2f37ea4c45a7b4ed1ced28efa716",
-                    "nonce" : "0xbaac5f60f12cca25",
+                    "hash" : "0xe9dfac66837ad85dab18debae6851a79d4bb2724f9eb9bc5c6703fc2fa112376",
+                    "mixHash" : "0x11aeb52a1b8d61e688e14e2e17448af95f138a61239d6e93ee0a0cd8f927aee6",
+                    "nonce" : "0xacbb66cdc11aa69c",
                     "number" : "0x01",
                     "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
                     "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05366b0c7e3746fd63f028ff56bcb1704707c2f37ea4c45a7b4ed1ced28efa71688baac5f60f12cca25f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a011aeb52a1b8d61e688e14e2e17448af95f138a61239d6e93ee0a0cd8f927aee688acbb66cdc11aa69cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c59d752aec85e23b8565a9ce8be3076e4477ee2820d1fe7ae849f62a6ce9019",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe9dfac66837ad85dab18debae6851a79d4bb2724f9eb9bc5c6703fc2fa112376",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "log2_dejavu_d0g0v0_Metropolis" : {
+    "log2_dejavu_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/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x3da7cd289f331072b2ba20bfa206069de9bb28573f1bc44dd4ce05d3c6f71cf0",
-                    "mixHash" : "0xc10fc310fda55a722925ed794dd390153823ad7d2f20515256a6a2e3820571b6",
-                    "nonce" : "0xf9918780195e8267",
+                    "hash" : "0x7c01a97ceb4d3488f702e29a65d11152b751feda3a55bf3e263459d43ec67e10",
+                    "mixHash" : "0x90c2932333839c37fcea0c2ad09b64b42e76ae3526cc594c45402b4b9e9329ee",
+                    "nonce" : "0xf66c0d36e02e3b10",
                     "number" : "0x01",
                     "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29",
+                    "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
+                    "stateRoot" : "0xf43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea3bdea2f0b7617db0912606e9c0b745f1d06a37e7f953130fd2ce0590ce1d29a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c10fc310fda55a722925ed794dd390153823ad7d2f20515256a6a2e3820571b688f9918780195e8267f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a090c2932333839c37fcea0c2ad09b64b42e76ae3526cc594c45402b4b9e9329ee88f66c0d36e02e3b10f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3da7cd289f331072b2ba20bfa206069de9bb28573f1bc44dd4ce05d3c6f71cf0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7c01a97ceb4d3488f702e29a65d11152b751feda3a55bf3e263459d43ec67e10",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "log2_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/log2_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x9b5eafdd4777c3ed1058455ea6d0f8a5172ed13cf2fd574be3209b562e2c3919",
+                    "mixHash" : "0x9056725da34c3515c816f402220cdaa8f16df9a706c691ee10484b30f2befbca",
+                    "nonce" : "0x9435946be1445a4b",
+                    "number" : "0x01",
+                    "parentHash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
+                    "receiptTrie" : "0xe833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5",
+                    "stateRoot" : "0xf43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0d7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f43db609382e284f68516d33b5c1dd155ffce4a29da5f8f98e66b0b8ed8852e6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e833136315bb22b155a1a70689c55f9c4b543bf28f48b949eedd0ac8c6c475e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09056725da34c3515c816f402220cdaa8f16df9a706c691ee10484b30f2befbca889435946be1445a4bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xd7e3a156a6368cc01493e7fd95156fad96dcbd50530cd400b5baacb1e189ecc6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b4a47efa9c6234bfb1073d01de04e6cb69aa040076150cfb2c3d2e227270ee5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9b5eafdd4777c3ed1058455ea6d0f8a5172ed13cf2fd574be3209b562e2c3919",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa2",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/log3_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/log3_dejavu_d0g0v0.json
index f536f7b71..7489033a9 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/log3_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/log3_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "log3_dejavu_d0g0v0_EIP150" : {
+    "log3_dejavu_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/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x8b6ac6b87df45704bc0516813ab0275a677efc72b0c4d7a268f1c860d7c03b4a",
-                    "mixHash" : "0x1501bc00650217dc639694bc64a447e91bef0355fb362d607cfd18b30b8a0705",
-                    "nonce" : "0xc9e3a1c59f641857",
+                    "hash" : "0x7f8b3f3e5eb539f2a0a0bc8857725676cf0acecf2f6654c62d7871768d215ea8",
+                    "mixHash" : "0xd29b6823a75fffa86a807d355868882c2d82734b8dfb629962d0507f81752536",
+                    "nonce" : "0x9de28652a60fbad4",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
-                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a01501bc00650217dc639694bc64a447e91bef0355fb362d607cfd18b30b8a070588c9e3a1c59f641857f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0d29b6823a75fffa86a807d355868882c2d82734b8dfb629962d0507f81752536889de28652a60fbad4f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b6ac6b87df45704bc0516813ab0275a677efc72b0c4d7a268f1c860d7c03b4a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7f8b3f3e5eb539f2a0a0bc8857725676cf0acecf2f6654c62d7871768d215ea8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "log3_dejavu_d0g0v0_EIP158" : {
+    "log3_dejavu_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/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x8217bbabc4b7c89f6f04dde8c4048ced5748ecac6ae38067ad43aa674c1682ff",
-                    "mixHash" : "0xa40f0add9e7bc0dbfed042c930edc20dc2680fed209826c160bfc61569166aca",
-                    "nonce" : "0x05eaaeeafd13b7c3",
+                    "hash" : "0x546464e212cb215ea1044e2a87872b8a6f6713b38677a61cda21f618619393c8",
+                    "mixHash" : "0xc0b95311e21cf75e38decf833b2779f7f13bada0b565d9b7681d3a3e4c02abca",
+                    "nonce" : "0xec09b505c0f0281c",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
-                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a40f0add9e7bc0dbfed042c930edc20dc2680fed209826c160bfc61569166aca8805eaaeeafd13b7c3f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c0b95311e21cf75e38decf833b2779f7f13bada0b565d9b7681d3a3e4c02abca88ec09b505c0f0281cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8217bbabc4b7c89f6f04dde8c4048ced5748ecac6ae38067ad43aa674c1682ff",
-        "network" : "EIP158",
+        "lastblockhash" : "0x546464e212cb215ea1044e2a87872b8a6f6713b38677a61cda21f618619393c8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "log3_dejavu_d0g0v0_Frontier" : {
+    "log3_dejavu_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/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x52e5400b6a4f941b0dc883a415065ff23e43941d4be96ce56f9046493ecc4a92",
-                    "mixHash" : "0xcdf97965545c0db0732cf1f916e2d44a7200ca0dd5fa9c660f839e0be7fb9479",
-                    "nonce" : "0x943dd7f8d9bd9ced",
+                    "hash" : "0xa366e55b07d470e95ef12448a011c16d20e5763acb59b259d611be231edbc008",
+                    "mixHash" : "0x8de918ddbdde3f353031d56e31f726a253b8214a84527b39af15af4cc7c17ab8",
+                    "nonce" : "0x74d0d650f18535fa",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
                     "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0cdf97965545c0db0732cf1f916e2d44a7200ca0dd5fa9c660f839e0be7fb947988943dd7f8d9bd9cedf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a08de918ddbdde3f353031d56e31f726a253b8214a84527b39af15af4cc7c17ab88874d0d650f18535faf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52e5400b6a4f941b0dc883a415065ff23e43941d4be96ce56f9046493ecc4a92",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa366e55b07d470e95ef12448a011c16d20e5763acb59b259d611be231edbc008",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "log3_dejavu_d0g0v0_Homestead" : {
+    "log3_dejavu_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/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x7291d740fdea3492bdc70854dd2a34f6b91cd29f2b45b1013b678f9e5a6f5a0a",
-                    "mixHash" : "0x83cd64baaf15795f819640ac28c46d3856637f560173f09e84479fef584a0a2c",
-                    "nonce" : "0x3bb2ceeeae27553f",
+                    "hash" : "0xcb33a77fab43c74f687942682c230f5c6cdb947749cfd67267b3b11b22af2a04",
+                    "mixHash" : "0xf49781c1fc1879da0e07f24922ae7cf388114440aa64ed56379cbac19d865498",
+                    "nonce" : "0x35c24cfa71696ceb",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
                     "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a083cd64baaf15795f819640ac28c46d3856637f560173f09e84479fef584a0a2c883bb2ceeeae27553ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f49781c1fc1879da0e07f24922ae7cf388114440aa64ed56379cbac19d8654988835c24cfa71696cebf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7291d740fdea3492bdc70854dd2a34f6b91cd29f2b45b1013b678f9e5a6f5a0a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcb33a77fab43c74f687942682c230f5c6cdb947749cfd67267b3b11b22af2a04",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "log3_dejavu_d0g0v0_Metropolis" : {
+    "log3_dejavu_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/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xa75f507e6d048ce2cd02f064139145b3721d02e9dfd565c025da46adb4ecc21c",
-                    "mixHash" : "0xd43339fb44485481f5e573638836679c1ec9a1886548818be5c4e4166d16577e",
-                    "nonce" : "0x320cd1ec02c3e4b3",
+                    "hash" : "0x8db4a63899e8f428c789238c187360927df9d5e2b9aacd3eca64a10147d46044",
+                    "mixHash" : "0x0d8cd20d45c1c95fdce9044aead830bb8c58559a10d7f1f84c8d787785127865",
+                    "nonce" : "0xc880489edbd68c04",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
+                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
+                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0d43339fb44485481f5e573638836679c1ec9a1886548818be5c4e4166d16577e88320cd1ec02c3e4b3f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a00d8cd20d45c1c95fdce9044aead830bb8c58559a10d7f1f84c8d78778512786588c880489edbd68c04f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa75f507e6d048ce2cd02f064139145b3721d02e9dfd565c025da46adb4ecc21c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8db4a63899e8f428c789238c187360927df9d5e2b9aacd3eca64a10147d46044",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "log3_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/log3_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x6671279ba28bad772e1432e3f2f987559e5adcc514af04701802cc5532e4b5e8",
+                    "mixHash" : "0x43d2a3371b4e45e130be6df13ed31d59778cf974491307f57636cd9b1016d092",
+                    "nonce" : "0xdb4b788c8ea757ef",
+                    "number" : "0x01",
+                    "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
+                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
+                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a043d2a3371b4e45e130be6df13ed31d59778cf974491307f57636cd9b1016d09288db4b788c8ea757eff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6671279ba28bad772e1432e3f2f987559e5adcc514af04701802cc5532e4b5e8",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/log4_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/log4_dejavu_d0g0v0.json
index 60bf703ae..2c1067796 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/log4_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/log4_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "log4_dejavu_d0g0v0_EIP150" : {
+    "log4_dejavu_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/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x39bdf48a4fb6b50bba69f70d0fe28b8761047bc8c217996f2150e68ac8806eb4",
-                    "mixHash" : "0x571d67bb9ee4afab558c386506abe0e997e901af4b256e34b74bcebcd665a185",
-                    "nonce" : "0xf46ade56c41e9e56",
+                    "hash" : "0x835f345b899344846f3dcac90e7acfd4c0764f78b66f917285d80a245dd89405",
+                    "mixHash" : "0x2278ff28b7a860b47d400f6151b757912a3fac3eada8268d28c644a2241a894f",
+                    "nonce" : "0xc60b9814d02cff5e",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
-                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0571d67bb9ee4afab558c386506abe0e997e901af4b256e34b74bcebcd665a18588f46ade56c41e9e56f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a02278ff28b7a860b47d400f6151b757912a3fac3eada8268d28c644a2241a894f88c60b9814d02cff5ef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39bdf48a4fb6b50bba69f70d0fe28b8761047bc8c217996f2150e68ac8806eb4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x835f345b899344846f3dcac90e7acfd4c0764f78b66f917285d80a245dd89405",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "log4_dejavu_d0g0v0_EIP158" : {
+    "log4_dejavu_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/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x1369a817a1ae314178c5cf7b69e54880578b32e5820f5f7e5e081b1e4ac75c2a",
-                    "mixHash" : "0xa70d339aa807066481245be718d23bb530611090f12ac464cd57f5829b592272",
-                    "nonce" : "0x92b1e13aeaefeae7",
+                    "hash" : "0xebd8683f0ae938dbe72ce906e63517dc1222dad25b8a8694aac2ec848c2615bf",
+                    "mixHash" : "0x9aac9fc3e44ba94f7b295a7baeb50c0f118a0acaf44d9920081cdb9b56c05003",
+                    "nonce" : "0x2c31b8366681c26d",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
-                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a70d339aa807066481245be718d23bb530611090f12ac464cd57f5829b5922728892b1e13aeaefeae7f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09aac9fc3e44ba94f7b295a7baeb50c0f118a0acaf44d9920081cdb9b56c05003882c31b8366681c26df864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1369a817a1ae314178c5cf7b69e54880578b32e5820f5f7e5e081b1e4ac75c2a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xebd8683f0ae938dbe72ce906e63517dc1222dad25b8a8694aac2ec848c2615bf",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "log4_dejavu_d0g0v0_Frontier" : {
+    "log4_dejavu_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/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x98170b9de369682f549686da558216cd972024cc0a5b45c7e98b3cadb91c6303",
-                    "mixHash" : "0xc5bd8d08fc210495e46cb784516550866dc48ac6998a251bc31cbf97a6098658",
-                    "nonce" : "0x30dd43585eea8950",
+                    "hash" : "0xf212d6fab96e6d07b9e1d4d4c1358c5a4c357083f802a255abdd73a7ba0870a8",
+                    "mixHash" : "0xec26aa087f2f05ee4f60db6ade8793af369f0f3e55a6eea5bdc45f07e0c3dfe7",
+                    "nonce" : "0xc49ee189295254cb",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
                     "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c5bd8d08fc210495e46cb784516550866dc48ac6998a251bc31cbf97a60986588830dd43585eea8950f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ec26aa087f2f05ee4f60db6ade8793af369f0f3e55a6eea5bdc45f07e0c3dfe788c49ee189295254cbf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98170b9de369682f549686da558216cd972024cc0a5b45c7e98b3cadb91c6303",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf212d6fab96e6d07b9e1d4d4c1358c5a4c357083f802a255abdd73a7ba0870a8",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "log4_dejavu_d0g0v0_Homestead" : {
+    "log4_dejavu_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/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x2e5c8c9c7b1f7ccc4010d67d6c97a488acb057dc7f5f2a3cecaabd5a42726cc3",
-                    "mixHash" : "0xa349b22619ff79d9b1456c5c004cf9e1075ac0984fdb85350ccee2cc976ab631",
-                    "nonce" : "0xeb2361ca20ef47bf",
+                    "hash" : "0x8089369aa25b7295fdb2f8c78d9fd01498e6d0b091292bf8e395c17f7dbf7fbe",
+                    "mixHash" : "0x57f6379cfacf167b4e6c94030687ea16eef512ea8f4b4a2bc8db3004cb61d020",
+                    "nonce" : "0x6247334388beb673",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
                     "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a349b22619ff79d9b1456c5c004cf9e1075ac0984fdb85350ccee2cc976ab63188eb2361ca20ef47bff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a057f6379cfacf167b4e6c94030687ea16eef512ea8f4b4a2bc8db3004cb61d020886247334388beb673f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e5c8c9c7b1f7ccc4010d67d6c97a488acb057dc7f5f2a3cecaabd5a42726cc3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8089369aa25b7295fdb2f8c78d9fd01498e6d0b091292bf8e395c17f7dbf7fbe",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "log4_dejavu_d0g0v0_Metropolis" : {
+    "log4_dejavu_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/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x4ba4a4ab09154afc63584db8b463efcbf93c6ac1460277dfba1bbda5c1476e31",
-                    "mixHash" : "0x52a0fd293ec14ac726140f828a06869e42794463781666ecb8aa2d9510a27893",
-                    "nonce" : "0xf4f108ac336f6a9c",
+                    "hash" : "0x7f8efe7ed72e5cf1e39e6c0863b4d5ef12c5d0caa6c48c5d8ef0d3acbdc0c20e",
+                    "mixHash" : "0x196d73cf3310439d4a2f74b497908a52b79e1f4d28b12b1f0183ca99ff6bd924",
+                    "nonce" : "0xbe079a17a63f0e7b",
                     "number" : "0x01",
                     "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197b",
+                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
+                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffce237d89d652287c0d0869a0ff17b4eca9ebfb816ae2b4013a409f7fad197ba06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a052a0fd293ec14ac726140f828a06869e42794463781666ecb8aa2d9510a2789388f4f108ac336f6a9cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0196d73cf3310439d4a2f74b497908a52b79e1f4d28b12b1f0183ca99ff6bd92488be079a17a63f0e7bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba4a4ab09154afc63584db8b463efcbf93c6ac1460277dfba1bbda5c1476e31",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7f8efe7ed72e5cf1e39e6c0863b4d5ef12c5d0caa6c48c5d8ef0d3acbdc0c20e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60ff60ff630fffffffa2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "log4_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/log4_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x2794f8d68e28df809e2df222fc18e0d216b43b93e5337d5e0778a57d89ea5f43",
+                    "mixHash" : "0x76ad5f6bb44188a72502b61a224ec1ca95c725a9f7a405cddb54f7545f21158d",
+                    "nonce" : "0xed2d1322722541b9",
+                    "number" : "0x01",
+                    "parentHash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
+                    "receiptTrie" : "0xe1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0c",
+                    "stateRoot" : "0x27c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c3f0015367e79a1cf49dd508c60d7e0ca02fbd363ced0b8b03ec25593cb9fea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0e1d4fd5f2b208ea8029dd328065d8e1c55fd9c99e75ec041b5724ef289518b0cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a076ad5f6bb44188a72502b61a224ec1ca95c725a9f7a405cddb54f7545f21158d88ed2d1322722541b9f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x282eab0dce6952e2c45a8f918e3f1a43327bf63615ea074c792c2ec8f8d4c661",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e6962ac30ef8bebbfb5faf798c585e17ec4337bb0bfe6cc0218f1c89cb280fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2794f8d68e28df809e2df222fc18e0d216b43b93e5337d5e0778a57d89ea5f43",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem0b_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem0b_singleByte_d0g0v0.json
index 0c236fc3c..b9fb115d7 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem0b_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem0b_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem0b_singleByte_d0g0v0_EIP150" : {
+    "mem0b_singleByte_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/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xef372067b6439f74141c3111c549269dfa66b5ae4e6dfea3a678aae7a077c56b",
-                    "mixHash" : "0x8a00558848af2e163af15e0bbcab2bd2a5b097b64b59507a2111aad64c755bda",
-                    "nonce" : "0xcbe6e2ff0e70f940",
+                    "hash" : "0xcdaf3644c66c56d33e5bf9b9a321650d6df01ad82b83459cc35bf2b8bdfb415d",
+                    "mixHash" : "0x20842bae24d606c6058b27ffc1a3c6e4b964e9514dd769a400a2d47951af0579",
+                    "nonce" : "0x94be5e742ee3f857",
                     "number" : "0x01",
                     "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
-                    "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
-                    "stateRoot" : "0x0b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0xa4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6ace",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a08a00558848af2e163af15e0bbcab2bd2a5b097b64b59507a2111aad64c755bda88cbe6e2ff0e70f940f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6acea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a020842bae24d606c6058b27ffc1a3c6e4b964e9514dd769a400a2d47951af05798894be5e742ee3f857f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef372067b6439f74141c3111c549269dfa66b5ae4e6dfea3a678aae7a077c56b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcdaf3644c66c56d33e5bf9b9a321650d6df01ad82b83459cc35bf2b8bdfb415d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60005359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem0b_singleByte_d0g0v0_EIP158" : {
+    "mem0b_singleByte_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/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xe2894bb26038d884d5f90e245b745c4fe950de24497d981586cf9ab5edf0502c",
-                    "mixHash" : "0x889cc71b81d974223576c34ce506030235161f5a7b0d90ec813aefda32c28785",
-                    "nonce" : "0x976a866dd6846692",
+                    "hash" : "0x99077095a4b578f7a7ea150621c0cc8d577e66a605405f9eb5b7426068e70174",
+                    "mixHash" : "0xa74a2bcee787305ea6de054a98bdace671e93b7acdd0060c5285146d8f6989dc",
+                    "nonce" : "0x16a147886d614924",
                     "number" : "0x01",
                     "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
-                    "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
-                    "stateRoot" : "0x0b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0xa4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6ace",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0889cc71b81d974223576c34ce506030235161f5a7b0d90ec813aefda32c2878588976a866dd6846692f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6acea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0a74a2bcee787305ea6de054a98bdace671e93b7acdd0060c5285146d8f6989dc8816a147886d614924f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2894bb26038d884d5f90e245b745c4fe950de24497d981586cf9ab5edf0502c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x99077095a4b578f7a7ea150621c0cc8d577e66a605405f9eb5b7426068e70174",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60005359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem0b_singleByte_d0g0v0_Frontier" : {
+    "mem0b_singleByte_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/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xdfcf31455b9b8b65c607dcf2855e362d7af455931c079881ea029d5f92d379e6",
-                    "mixHash" : "0x7b173bec05495a88583ea8f8bc05ca1472aaa4d14c130f8c692f37af6093a867",
-                    "nonce" : "0x815569c297b9e34c",
+                    "hash" : "0x099595c0e2be6404f5452b33f9b66db8973c5ad8d8afc55f0421e7a3886ca122",
+                    "mixHash" : "0xf11b8d55de08720eee45254510302ee87b4fd343af6162854626b4b006e5e231",
+                    "nonce" : "0x0928ed0b9496e605",
                     "number" : "0x01",
                     "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
                     "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a07b173bec05495a88583ea8f8bc05ca1472aaa4d14c130f8c692f37af6093a86788815569c297b9e34cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0f11b8d55de08720eee45254510302ee87b4fd343af6162854626b4b006e5e231880928ed0b9496e605f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfcf31455b9b8b65c607dcf2855e362d7af455931c079881ea029d5f92d379e6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x099595c0e2be6404f5452b33f9b66db8973c5ad8d8afc55f0421e7a3886ca122",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem0b_singleByte_d0g0v0_Homestead" : {
+    "mem0b_singleByte_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/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xb8923993031a3b98fd2befda7b4bb25481c8a5c96ebde453c4c3fed2beade594",
-                    "mixHash" : "0x969a449cdf14751fbfc146d96056533839495b0998a0544320ae90c43505b12f",
-                    "nonce" : "0x3c5e95a40c0a5857",
+                    "hash" : "0xbe71fef0babef892a2cfde4c93edbee680c726d2a56e696a45ee06dee7f7aac9",
+                    "mixHash" : "0x1cbc678891d81d50577f09c12b40fab55c6e4ef96234ee29d486e45dd2cbb2ef",
+                    "nonce" : "0x8aff4d3599b2236b",
                     "number" : "0x01",
                     "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
                     "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0969a449cdf14751fbfc146d96056533839495b0998a0544320ae90c43505b12f883c5e95a40c0a5857f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a01cbc678891d81d50577f09c12b40fab55c6e4ef96234ee29d486e45dd2cbb2ef888aff4d3599b2236bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8923993031a3b98fd2befda7b4bb25481c8a5c96ebde453c4c3fed2beade594",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbe71fef0babef892a2cfde4c93edbee680c726d2a56e696a45ee06dee7f7aac9",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem0b_singleByte_d0g0v0_Metropolis" : {
+    "mem0b_singleByte_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/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x50b7e556fb7b700381cd9c6810bc0076239d7d5913dc718cbed5fb5a27d09d76",
-                    "mixHash" : "0xdbc4a6679cd19e72c51e3e60221ca1e3b77a62af4e0aad1658ff64078cd17359",
-                    "nonce" : "0x0754780630e7038a",
+                    "hash" : "0xe68d3c69faf48dd19d638066534cdf6f0ba35654095f5059ba8155f1dd6c0a3a",
+                    "mixHash" : "0xd4c627a1bee79c5006568cb4f789c8c6cc1f89aea5f698994e171379b5d61057",
+                    "nonce" : "0x5091ac5355d1bd96",
                     "number" : "0x01",
                     "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
-                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
-                    "stateRoot" : "0xa4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6ace",
+                    "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
+                    "stateRoot" : "0x0b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4bb491a71492c73ca5ea0482366f587c8f53f10902f4a701e966ff718ea6acea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0dbc4a6679cd19e72c51e3e60221ca1e3b77a62af4e0aad1658ff64078cd17359880754780630e7038af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0d4c627a1bee79c5006568cb4f789c8c6cc1f89aea5f698994e171379b5d61057885091ac5355d1bd96f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50b7e556fb7b700381cd9c6810bc0076239d7d5913dc718cbed5fb5a27d09d76",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe68d3c69faf48dd19d638066534cdf6f0ba35654095f5059ba8155f1dd6c0a3a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a60005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a039",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff5fbd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a60005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem0b_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem0b_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xa039",
+                    "hash" : "0x903db32f5777404bebb1a29fa2c4d010aa72829b1b9259c03f887935534593d2",
+                    "mixHash" : "0xd7b70e33e94d743fb3a291b524bb0bcadcc237fc2fd020112fbab3315bf0a7c7",
+                    "nonce" : "0x0c02751bb80764c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
+                    "receiptTrie" : "0xdb586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91a",
+                    "stateRoot" : "0x0b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a071accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b38c575208d65f5cf8e0ae8d13ad7fc0e76e7c5a61ffe35544f47e343322768a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0db586b2faf210843b00880d8c38ec501dec7cf79af3fded47c6a276c0091d91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0d7b70e33e94d743fb3a291b524bb0bcadcc237fc2fd020112fbab3315bf0a7c7880c02751bb80764c6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x71accd5f08f97d0d788faee8b5c2627055b9a7f80fba214aaad0d0236b2a9e4e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c17a5f7addc212414bdd06d606f89a0826620cbf76269e819127c572382686c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x903db32f5777404bebb1a29fa2c4d010aa72829b1b9259c03f887935534593d2",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60005359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem31b_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem31b_singleByte_d0g0v0.json
index 86e8172f9..f446d81d8 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem31b_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem31b_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem31b_singleByte_d0g0v0_EIP150" : {
+    "mem31b_singleByte_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/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xcf0c57ac376cb3522012cc89448fa210dd2b7514225c09c97135dcb5d9b27d93",
-                    "mixHash" : "0x068d0ff89ae7c0d269cba05647dbb01d9fb9287f947d03eea7ed6c6eb241b89a",
-                    "nonce" : "0x4cc175146cc68ce1",
+                    "hash" : "0x05bd9a4e07f67060929768582bda3393b765e37af36810884a0f77233e0230ab",
+                    "mixHash" : "0xb0a9118e21e8152b26400843ec94a5d97cdad119e3f72eef97441f59f49076f0",
+                    "nonce" : "0x0c36f0cb0c528213",
                     "number" : "0x01",
                     "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
-                    "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
-                    "stateRoot" : "0xa07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64c",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0x98cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0068d0ff89ae7c0d269cba05647dbb01d9fb9287f947d03eea7ed6c6eb241b89a884cc175146cc68ce1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0b0a9118e21e8152b26400843ec94a5d97cdad119e3f72eef97441f59f49076f0880c36f0cb0c528213f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf0c57ac376cb3522012cc89448fa210dd2b7514225c09c97135dcb5d9b27d93",
-        "network" : "EIP150",
+        "lastblockhash" : "0x05bd9a4e07f67060929768582bda3393b765e37af36810884a0f77233e0230ab",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601e5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem31b_singleByte_d0g0v0_EIP158" : {
+    "mem31b_singleByte_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/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xba38800bd0ba2c66aff485e69f77a701c7fd7d602838a12137bf7cda9827840f",
-                    "mixHash" : "0xff9c77000a2c011b84edd31c81752578ed48edbfef3941f7737e5cff72519bbb",
-                    "nonce" : "0x64aa585e579cd5a8",
+                    "hash" : "0x8f4731a4adc83bd0a0300bece51327bbe87c3a664de2f68ec98825b5a25a46bd",
+                    "mixHash" : "0xd6ecce42edaef08d133a29b11469a4b5b6c28c6fb08a948677aff0cc930133f0",
+                    "nonce" : "0x9bfd5488b2a1ff8f",
                     "number" : "0x01",
                     "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
-                    "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
-                    "stateRoot" : "0xa07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64c",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0x98cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0ff9c77000a2c011b84edd31c81752578ed48edbfef3941f7737e5cff72519bbb8864aa585e579cd5a8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0d6ecce42edaef08d133a29b11469a4b5b6c28c6fb08a948677aff0cc930133f0889bfd5488b2a1ff8ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba38800bd0ba2c66aff485e69f77a701c7fd7d602838a12137bf7cda9827840f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8f4731a4adc83bd0a0300bece51327bbe87c3a664de2f68ec98825b5a25a46bd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601e5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem31b_singleByte_d0g0v0_Frontier" : {
+    "mem31b_singleByte_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/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x97e7d53fa8d5f076bd88b029a0f9cf9cec901da8be736a342ac7a88d1fa12939",
-                    "mixHash" : "0x2c7ceee4201d522b53b2ecad58ee98d00361e749bba26e569869865cea7c827f",
-                    "nonce" : "0x85724ed2d1cf7076",
+                    "hash" : "0x4bebba68ce5fafde8b2d3fb7fdd3657bad65a65d0f03f315e7c0f4d56204675c",
+                    "mixHash" : "0xffdaf272f933960db30e35bb2a93679bf1d50e611313eee40d12b96538e3c98c",
+                    "nonce" : "0xaa2e9d2a8c14e7c0",
                     "number" : "0x01",
                     "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
                     "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a02c7ceee4201d522b53b2ecad58ee98d00361e749bba26e569869865cea7c827f8885724ed2d1cf7076f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0ffdaf272f933960db30e35bb2a93679bf1d50e611313eee40d12b96538e3c98c88aa2e9d2a8c14e7c0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97e7d53fa8d5f076bd88b029a0f9cf9cec901da8be736a342ac7a88d1fa12939",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4bebba68ce5fafde8b2d3fb7fdd3657bad65a65d0f03f315e7c0f4d56204675c",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem31b_singleByte_d0g0v0_Homestead" : {
+    "mem31b_singleByte_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/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x4c14abcf4a851c46ef0f22f70510f44644050d2d42aff312f1b7088021599701",
-                    "mixHash" : "0xc3bb9760af38d3ef82ad0ae4692dcf0facf5a04b15437eabc87aad0cdfb73ad8",
-                    "nonce" : "0x25f00552a55771d5",
+                    "hash" : "0xfd49fffa8c100d573ca69c85c9d815bb31b871187ad920c43c12b35610ba9f0b",
+                    "mixHash" : "0x760fc6030513e98bec3a7cd8cb4e4a51c1f933398924db36a2db0c0147651fd6",
+                    "nonce" : "0x650297110007dbdb",
                     "number" : "0x01",
                     "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
                     "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0c3bb9760af38d3ef82ad0ae4692dcf0facf5a04b15437eabc87aad0cdfb73ad88825f00552a55771d5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0760fc6030513e98bec3a7cd8cb4e4a51c1f933398924db36a2db0c0147651fd688650297110007dbdbf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c14abcf4a851c46ef0f22f70510f44644050d2d42aff312f1b7088021599701",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfd49fffa8c100d573ca69c85c9d815bb31b871187ad920c43c12b35610ba9f0b",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem31b_singleByte_d0g0v0_Metropolis" : {
+    "mem31b_singleByte_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/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x14b66a7c5d0f6475eda7c1ff6c5de6a91a06d391765847624905552f98985d9f",
-                    "mixHash" : "0xca0810d0c88c1f0f507465baaf69d8d6454a53e51c350f88154cf7d50226d228",
-                    "nonce" : "0x78fa571ba273293d",
+                    "hash" : "0x38a80e930303ebea366460aa9323b0c9f009803977a207e4456cfd7b9a036398",
+                    "mixHash" : "0x39ed9cd6cc36eada294b2a6e304b0de17eb96efddb43a30d316c123633366478",
+                    "nonce" : "0xf1cc45bc35034194",
                     "number" : "0x01",
                     "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
-                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
-                    "stateRoot" : "0x98cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57e",
+                    "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
+                    "stateRoot" : "0xa07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098cd731a8112e1cd07999cc5db958e33ef3a41473ac5fdd1e0edd969af53e57ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0ca0810d0c88c1f0f507465baaf69d8d6454a53e51c350f88154cf7d50226d2288878fa571ba273293df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a039ed9cd6cc36eada294b2a6e304b0de17eb96efddb43a30d316c12363336647888f1cc45bc35034194f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14b66a7c5d0f6475eda7c1ff6c5de6a91a06d391765847624905552f98985d9f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x38a80e930303ebea366460aa9323b0c9f009803977a207e4456cfd7b9a036398",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a601e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a039",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff5fbd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a601e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem31b_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem31b_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xa039",
+                    "hash" : "0xa44a011de287c787937f4b9f5e7e5bf4097fab3413ba610702daba1e250b0c2b",
+                    "mixHash" : "0xdfb8bb26796956b32abc041f1f302d3fa3fc7ad4add433a751dc2d067f845ebc",
+                    "nonce" : "0xb2678947fd2f82b1",
+                    "number" : "0x01",
+                    "parentHash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
+                    "receiptTrie" : "0xb5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9b",
+                    "stateRoot" : "0xa07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a07d6129cc104619e23c6b67e4e44042f3d7f95490879b89c37c7b30d382f64ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b5d5ec847e4648859147676163069b7bc683e69a3389a2e6fefd84ebf447eb9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0dfb8bb26796956b32abc041f1f302d3fa3fc7ad4add433a751dc2d067f845ebc88b2678947fd2f82b1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x002f35c31fd2b8ac2772527bb0b012af8b4026a78c83b258fe01a2971f01299e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5da279200c51004abf8a010550d0c9dea42a5a296a13d5a06463acd3d9b8a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa44a011de287c787937f4b9f5e7e5bf4097fab3413ba610702daba1e250b0c2b",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601e5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32b_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32b_singleByte_d0g0v0.json
index bead97dc0..52f4519ba 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32b_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32b_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32b_singleByte_d0g0v0_EIP150" : {
+    "mem32b_singleByte_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/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x86c0588d6190dd9774a10caa4ec8b07f4cf2ed7d23c341f15494d74cb8e77302",
-                    "mixHash" : "0xd6241eceaea17d9bca0ce2f47a833547cad79b4833c37d81e1e4948aa43e5af6",
-                    "nonce" : "0x7305da3dd32ab4db",
+                    "hash" : "0xaa608af584f9ef693ab8d0be01273b017f00c37b85812cf6b30b79ff0bc3ce9e",
+                    "mixHash" : "0xd3cd8933c0eec1f1c56169df2bbaae52e7cdbaaf396dd58249e7dfad1f979d98",
+                    "nonce" : "0xa95ffd97dba2e939",
                     "number" : "0x01",
                     "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
-                    "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
-                    "stateRoot" : "0x1ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8ce",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0x422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0d6241eceaea17d9bca0ce2f47a833547cad79b4833c37d81e1e4948aa43e5af6887305da3dd32ab4dbf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0d3cd8933c0eec1f1c56169df2bbaae52e7cdbaaf396dd58249e7dfad1f979d9888a95ffd97dba2e939f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86c0588d6190dd9774a10caa4ec8b07f4cf2ed7d23c341f15494d74cb8e77302",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaa608af584f9ef693ab8d0be01273b017f00c37b85812cf6b30b79ff0bc3ce9e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601f5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32b_singleByte_d0g0v0_EIP158" : {
+    "mem32b_singleByte_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/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x83d622b6e83f501d6d4d539c3572d76bb34ba0d9f1318583cf152385240ea860",
-                    "mixHash" : "0xe42ba4a15646f6aa0c2b61da981885e18e0da3bb52d96c081513b5907d463b51",
-                    "nonce" : "0xc0d0bc277a3c034a",
+                    "hash" : "0x07f3b3ab957bb8a8a852107aa20b1a4d68c7b93b32a9cab2239f1945e9206e8a",
+                    "mixHash" : "0x0804f4ffd857827106bbd3266536688fd988c6e3085d8103ee8eb9a8540ac7ee",
+                    "nonce" : "0x954fdc28b98f4350",
                     "number" : "0x01",
                     "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
-                    "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
-                    "stateRoot" : "0x1ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8ce",
+                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
+                    "stateRoot" : "0x422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0e42ba4a15646f6aa0c2b61da981885e18e0da3bb52d96c081513b5907d463b5188c0d0bc277a3c034af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a00804f4ffd857827106bbd3266536688fd988c6e3085d8103ee8eb9a8540ac7ee88954fdc28b98f4350f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83d622b6e83f501d6d4d539c3572d76bb34ba0d9f1318583cf152385240ea860",
-        "network" : "EIP158",
+        "lastblockhash" : "0x07f3b3ab957bb8a8a852107aa20b1a4d68c7b93b32a9cab2239f1945e9206e8a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601f5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32b_singleByte_d0g0v0_Frontier" : {
+    "mem32b_singleByte_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/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x374d260a0d17163b4809437520b1e69f9a4da10a7f5d63f5dc39c50e546fe86b",
-                    "mixHash" : "0xfd7efb82920ec9406c6902676bd1a0f049f9e48674a6088b8fd095dfcc3d6442",
-                    "nonce" : "0x4df373d66d5ecf53",
+                    "hash" : "0xeb0dbbdf5d09fed332b201fc737704a9560474d0d6ee8c68461069ca2e1994f6",
+                    "mixHash" : "0x6198978b4505dcad7a794ee8aa9c8e8eb9e4ed54cb1279fc23a071f9a3c220f2",
+                    "nonce" : "0xaabc587437709557",
                     "number" : "0x01",
                     "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
                     "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0fd7efb82920ec9406c6902676bd1a0f049f9e48674a6088b8fd095dfcc3d6442884df373d66d5ecf53f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a06198978b4505dcad7a794ee8aa9c8e8eb9e4ed54cb1279fc23a071f9a3c220f288aabc587437709557f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x374d260a0d17163b4809437520b1e69f9a4da10a7f5d63f5dc39c50e546fe86b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeb0dbbdf5d09fed332b201fc737704a9560474d0d6ee8c68461069ca2e1994f6",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32b_singleByte_d0g0v0_Homestead" : {
+    "mem32b_singleByte_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/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0xe4db34577b62140e9d8a36c68f754e86f798a918daa90ac520eb505a74aad3b9",
-                    "mixHash" : "0x790a6c289e130eeb6155759e8e8dbd8b875077a0ff6255c5488532f429f4e8a4",
-                    "nonce" : "0xccc4b4673276281d",
+                    "hash" : "0x370fbedd1add42238b2d30015bbd6cec6fb222007c194033bb6b7d5c73d93050",
+                    "mixHash" : "0xe0e1bd342fd28137985da9b5911cd557113f2f2e6d2f9d2cc9c56ba0a12cb276",
+                    "nonce" : "0x8900c9430bcc76e7",
                     "number" : "0x01",
                     "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
                     "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0790a6c289e130eeb6155759e8e8dbd8b875077a0ff6255c5488532f429f4e8a488ccc4b4673276281df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0e0e1bd342fd28137985da9b5911cd557113f2f2e6d2f9d2cc9c56ba0a12cb276888900c9430bcc76e7f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4db34577b62140e9d8a36c68f754e86f798a918daa90ac520eb505a74aad3b9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x370fbedd1add42238b2d30015bbd6cec6fb222007c194033bb6b7d5c73d93050",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32b_singleByte_d0g0v0_Metropolis" : {
+    "mem32b_singleByte_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/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa039",
-                    "hash" : "0x343e20746ea12db16511407193897a89af5512679bc924c8c6375fdaf0fe29a4",
-                    "mixHash" : "0xadb455a27a4448603fe0958895a7d461bbc571bb6973ff9e793a44f8ad936d63",
-                    "nonce" : "0xf359b234956b4b3d",
+                    "hash" : "0x901896bb7ab78785dc93131038d5f548a1dc9d7d74c3c577c8d5c7e9a88f8481",
+                    "mixHash" : "0x9f8f1ea1e9e8b7382dd0fa9e961035a33e3662b4e387826096647b1faa9042e5",
+                    "nonce" : "0x64e884ebae36e3dd",
                     "number" : "0x01",
                     "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
-                    "receiptTrie" : "0xa5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5b",
-                    "stateRoot" : "0x422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081c",
+                    "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
+                    "stateRoot" : "0x1ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0422c82354bef6c6d68c6b2d685a6da5f2d502063b6f55bf8296687260a06081ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a5d8d93c0c42f6b0dd0783f13badb6f625c366f6c1b25a0bcb9c29727598dd5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0adb455a27a4448603fe0958895a7d461bbc571bb6973ff9e793a44f8ad936d6388f359b234956b4b3df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a09f8f1ea1e9e8b7382dd0fa9e961035a33e3662b4e387826096647b1faa9042e58864e884ebae36e3ddf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x343e20746ea12db16511407193897a89af5512679bc924c8c6375fdaf0fe29a4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x901896bb7ab78785dc93131038d5f548a1dc9d7d74c3c577c8d5c7e9a88f8481",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a601f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a039",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff5fbd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a601f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32b_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32b_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xa039",
+                    "hash" : "0x7fa29cb1e2039b3382883fa96dbe1219b74fc02c559894d14baa55d7c2410e45",
+                    "mixHash" : "0x593f57d6809a90ebde6e52cc2a9e5726220385af182fc025bdd404d102955328",
+                    "nonce" : "0x5379cd42ce78f024",
+                    "number" : "0x01",
+                    "parentHash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
+                    "receiptTrie" : "0x17f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586",
+                    "stateRoot" : "0x1ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8ce",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ba1d8590f84336a42dd9cc58c38e17f167460edbc28841bddfa6d1f7c51a8cea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa017f194661321fdb702e68d4109c86a48530c9e2a6242274df8acee61b33a3586b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a0398203e880a0593f57d6809a90ebde6e52cc2a9e5726220385af182fc025bdd404d102955328885379cd42ce78f024f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x561f8b24a803f03cfc7b7b75a5faecee14896a5ca18ca07178c3ca491345cdf5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f3f5adab7eff18b1ed775089159321fc7864a93799b411a531a6bcd6770906aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7fa29cb1e2039b3382883fa96dbe1219b74fc02c559894d14baa55d7c2410e45",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a601f5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+1_d0g0v0.json
index 97528d8ce..9d97074ae 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb+1_d0g0v0_EIP150" : {
+    "mem32kb+1_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/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x544ba5045346064756b249cf4d763261122bef0d2a23eb55fe2c5e40a96b156c",
-                    "mixHash" : "0xd2a06ab34794a22e670716b862dc7bd52c90da76c3c8a130d5cd454f645d3750",
-                    "nonce" : "0x2c32ec386338c780",
+                    "hash" : "0x9c414324796e2e93e95305a786e4c497db9f2fee6ba6f6fae4d2f67f67007cae",
+                    "mixHash" : "0x199afa1ea5a68b19be2a03e4fbaf13f609bc297debb5cb5b754da3945998f4ff",
+                    "nonce" : "0x52f7c803bd10422b",
                     "number" : "0x01",
                     "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
-                    "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
-                    "stateRoot" : "0x6e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0x3efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0d2a06ab34794a22e670716b862dc7bd52c90da76c3c8a130d5cd454f645d3750882c32ec386338c780f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0199afa1ea5a68b19be2a03e4fbaf13f609bc297debb5cb5b754da3945998f4ff8852f7c803bd10422bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x544ba5045346064756b249cf4d763261122bef0d2a23eb55fe2c5e40a96b156c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9c414324796e2e93e95305a786e4c497db9f2fee6ba6f6fae4d2f67f67007cae",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce152617ce15160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb+1_d0g0v0_EIP158" : {
+    "mem32kb+1_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/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x55d4da8f39418c571f387bc02c81aad9f2055e4bd9a50606d42a3e6913df6eb4",
-                    "mixHash" : "0x881f45bace090f5054a408eb6b684d6f1d7637c3f3f1bc8d611470bae4d80bdb",
-                    "nonce" : "0xb6d616a917cd9672",
+                    "hash" : "0x783ea8ce355f78838a42d459bfc76e5d6eeec9316a8594c45205d59720c9b45e",
+                    "mixHash" : "0x0381286e0d25d852503e1d9042126b74379acb7a253cc35bd9e2dd59b56c74b2",
+                    "nonce" : "0x712f414dbfce3dc2",
                     "number" : "0x01",
                     "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
-                    "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
-                    "stateRoot" : "0x6e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0x3efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0881f45bace090f5054a408eb6b684d6f1d7637c3f3f1bc8d611470bae4d80bdb88b6d616a917cd9672f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a00381286e0d25d852503e1d9042126b74379acb7a253cc35bd9e2dd59b56c74b288712f414dbfce3dc2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55d4da8f39418c571f387bc02c81aad9f2055e4bd9a50606d42a3e6913df6eb4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x783ea8ce355f78838a42d459bfc76e5d6eeec9316a8594c45205d59720c9b45e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce152617ce15160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb+1_d0g0v0_Frontier" : {
+    "mem32kb+1_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/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x2109f5f199cc6c0b0231e7627f75660783782daed05b3d2d125f0bf60d2483d8",
-                    "mixHash" : "0x627c9a9e7d5db313be8cee2364d4bdea7245da40530c062850324c9ea36e9ff7",
-                    "nonce" : "0x1cad2075147313ac",
+                    "hash" : "0x0085e63f0d2e35b2419541af382bc88764cf7b15847bb8102b977a488dc07942",
+                    "mixHash" : "0x82bbcfe405f17070fbedaaf0b985776d68e5e15085f599e41bbe5023d30ffb13",
+                    "nonce" : "0x1d82c45206900318",
                     "number" : "0x01",
                     "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
                     "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0627c9a9e7d5db313be8cee2364d4bdea7245da40530c062850324c9ea36e9ff7881cad2075147313acf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a082bbcfe405f17070fbedaaf0b985776d68e5e15085f599e41bbe5023d30ffb13881d82c45206900318f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2109f5f199cc6c0b0231e7627f75660783782daed05b3d2d125f0bf60d2483d8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0085e63f0d2e35b2419541af382bc88764cf7b15847bb8102b977a488dc07942",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb+1_d0g0v0_Homestead" : {
+    "mem32kb+1_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/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x4fec6ca09a4a85fa56a786a874d9d3282526406a5c21ce08629c81c3ade33c93",
-                    "mixHash" : "0xea4cffaa2f9ef6ccfbf056461d5efeb56996884f5d14f04867b38a75a0cabf7a",
-                    "nonce" : "0x73b1c55fac0ba83d",
+                    "hash" : "0x77506fa58f14844b3a2f52e1a03ba9609c1c1136d9f9b0d644c0b979fcec7458",
+                    "mixHash" : "0xb76bbc09330ef5e4016283b8123c3ac8ddcfca9e6f7d70e078d570c61354d2cb",
+                    "nonce" : "0x7e7b4fc94951fb4d",
                     "number" : "0x01",
                     "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
                     "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0ea4cffaa2f9ef6ccfbf056461d5efeb56996884f5d14f04867b38a75a0cabf7a8873b1c55fac0ba83df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0b76bbc09330ef5e4016283b8123c3ac8ddcfca9e6f7d70e078d570c61354d2cb887e7b4fc94951fb4df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fec6ca09a4a85fa56a786a874d9d3282526406a5c21ce08629c81c3ade33c93",
-        "network" : "Homestead",
+        "lastblockhash" : "0x77506fa58f14844b3a2f52e1a03ba9609c1c1136d9f9b0d644c0b979fcec7458",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb+1_d0g0v0_Metropolis" : {
+    "mem32kb+1_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/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x86e41037671734d011fecf75bba2dc08ee91d801a359d09a5390148d90317bef",
-                    "mixHash" : "0xb92bb89f225d54cf8118b2abdc0720fb0efa1a73a942a4fa01a4436de2e3da45",
-                    "nonce" : "0xd3e19affa32fc856",
+                    "hash" : "0x9096ca4ff8b2e1cdc14e5e4cfecf629f8da9150a24923f7321d8c943f78b4591",
+                    "mixHash" : "0x2307c556ddcf8c1918b2ae3fc077a301184ddcd26cea9bb01c7d75f6c52d546c",
+                    "nonce" : "0x03ef06b6c2acfc2b",
                     "number" : "0x01",
                     "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
-                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
-                    "stateRoot" : "0x3efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573",
+                    "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
+                    "stateRoot" : "0x6e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03efbd089b7e35f20c91e6767f33adabed18c652a596d6f2ebdb4027508ad8573a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0b92bb89f225d54cf8118b2abdc0720fb0efa1a73a942a4fa01a4436de2e3da4588d3e19affa32fc856f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a02307c556ddcf8c1918b2ae3fc077a301184ddcd26cea9bb01c7d75f6c52d546c8803ef06b6c2acfc2bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86e41037671734d011fecf75bba2dc08ee91d801a359d09a5390148d90317bef",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9096ca4ff8b2e1cdc14e5e4cfecf629f8da9150a24923f7321d8c943f78b4591",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617ce152617ce15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501bf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe37",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617ce152617ce15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb+1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb+1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101bf",
+                    "hash" : "0xaa6bc5c60d09bae2dd73bbd5832df1d2c6d41ba77fa38581bf24562bdca1288a",
+                    "mixHash" : "0x7e99d657ae7926c8c80c37e289e03c2a5ec470e67622d748b41ac89085809956",
+                    "nonce" : "0xd32e1d47c6281495",
+                    "number" : "0x01",
+                    "parentHash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
+                    "receiptTrie" : "0xb753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959",
+                    "stateRoot" : "0x6e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa01311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e238c04aa9606d327485db10ce4e4660a64afe204e5376278731caff4357ff7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b753c5901e54d668ba289eea5c57e0e0f21f6ef4e0ac4f5cf55df3e2b73c5959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a07e99d657ae7926c8c80c37e289e03c2a5ec470e67622d748b41ac8908580995688d32e1d47c6281495f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x1311a577e8da35a207320fe33a0828291f9b72daea3a3fb71a4cb715671c9d33",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06390ea37b90b2de1ec9a57957fbc51e9784127ad1a4200be5368ae54bfd1d7c9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa6bc5c60d09bae2dd73bbd5832df1d2c6d41ba77fa38581bf24562bdca1288a",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce152617ce15160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+31_d0g0v0.json
index 53d01c002..8cefa4576 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb+31_d0g0v0_EIP150" : {
+    "mem32kb+31_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/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0xfdd9232343f4a1edb4a11042c99ce27a91b57b984e156916db71207dd0612d8b",
-                    "mixHash" : "0xa77da36fe1e8b84b93af36ca41581eac24415ecab7c6da3ae76d804a4c49108d",
-                    "nonce" : "0x869e756e8149d97c",
+                    "hash" : "0x704d79688d8f7ea5036ccf4828fee152d31ad58874d44f7fc767a842ade7fd0a",
+                    "mixHash" : "0xc3a6d5c3609ebe35fb2e7984fc1268d5fd4604df9d7cdbfdf65216107169bfe7",
+                    "nonce" : "0xaad45b0458b95e15",
                     "number" : "0x01",
                     "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
-                    "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
-                    "stateRoot" : "0x7584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7f",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0xbbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0a77da36fe1e8b84b93af36ca41581eac24415ecab7c6da3ae76d804a4c49108d88869e756e8149d97cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0c3a6d5c3609ebe35fb2e7984fc1268d5fd4604df9d7cdbfdf65216107169bfe788aad45b0458b95e15f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdd9232343f4a1edb4a11042c99ce27a91b57b984e156916db71207dd0612d8b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x704d79688d8f7ea5036ccf4828fee152d31ad58874d44f7fc767a842ade7fd0a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff52617cff5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb+31_d0g0v0_EIP158" : {
+    "mem32kb+31_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/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x3273c7e593dc5a99ee2e9fee286d5484c3ea04b871071cf5f5f23bad6e6f18e0",
-                    "mixHash" : "0x059e35e722a93d28173b9eecdd9b33ab086394fc2e90662185dfc476dcbc892a",
-                    "nonce" : "0x0527e96cf3c72ff2",
+                    "hash" : "0x5500d26c3bc7fb3ac9ceb20204f029169707d5436ab6dc923ad2c244ec2abe9b",
+                    "mixHash" : "0xc233af6231ee23ef5db842ea99464a77d3956192030971f006e35af43c26ee10",
+                    "nonce" : "0x544d28f753fab2a2",
                     "number" : "0x01",
                     "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
-                    "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
-                    "stateRoot" : "0x7584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7f",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0xbbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0059e35e722a93d28173b9eecdd9b33ab086394fc2e90662185dfc476dcbc892a880527e96cf3c72ff2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0c233af6231ee23ef5db842ea99464a77d3956192030971f006e35af43c26ee1088544d28f753fab2a2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3273c7e593dc5a99ee2e9fee286d5484c3ea04b871071cf5f5f23bad6e6f18e0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5500d26c3bc7fb3ac9ceb20204f029169707d5436ab6dc923ad2c244ec2abe9b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff52617cff5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb+31_d0g0v0_Frontier" : {
+    "mem32kb+31_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/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0xf8ec77de46d7316cc14d43ff9844b826da64232fd22bd1058001e3618176bc6e",
-                    "mixHash" : "0x0fe0fb585589359be9af77fd3672c55e9f71d4dfa78b3d1dd43a6959fdee4606",
-                    "nonce" : "0xc2d018f53c765d55",
+                    "hash" : "0x8d2fdf31b8b1ce61f569d046ee0e3c26ee4744bca47a61afaa5496b89753e8ce",
+                    "mixHash" : "0x31244b7f4363767e7bb08a778e78b0c16c0fb3f8f8f6510e0766f7b5f806f2ff",
+                    "nonce" : "0x5adc6ab256fd6d43",
                     "number" : "0x01",
                     "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
                     "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a00fe0fb585589359be9af77fd3672c55e9f71d4dfa78b3d1dd43a6959fdee460688c2d018f53c765d55f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a031244b7f4363767e7bb08a778e78b0c16c0fb3f8f8f6510e0766f7b5f806f2ff885adc6ab256fd6d43f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8ec77de46d7316cc14d43ff9844b826da64232fd22bd1058001e3618176bc6e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8d2fdf31b8b1ce61f569d046ee0e3c26ee4744bca47a61afaa5496b89753e8ce",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb+31_d0g0v0_Homestead" : {
+    "mem32kb+31_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/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0xa6f86de95cded025a05de889eacecaec784a4fc4c08d485a29737e4c9395aa98",
-                    "mixHash" : "0x9e63747affcfecd8510eda1bcd4f41e3c4d688e4426c8ae71f08546b64fa7955",
-                    "nonce" : "0x208e40356853bce5",
+                    "hash" : "0x35a3d1d006b3408621b74ab99dd5693dd6d43ede49881f04b36cd4336f57f7f7",
+                    "mixHash" : "0x1814ce750711a31f331a749f48c23c7553010e70209722907a3ad97cb27f072a",
+                    "nonce" : "0xc6b44cb46830b766",
                     "number" : "0x01",
                     "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
                     "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a09e63747affcfecd8510eda1bcd4f41e3c4d688e4426c8ae71f08546b64fa795588208e40356853bce5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a01814ce750711a31f331a749f48c23c7553010e70209722907a3ad97cb27f072a88c6b44cb46830b766f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6f86de95cded025a05de889eacecaec784a4fc4c08d485a29737e4c9395aa98",
-        "network" : "Homestead",
+        "lastblockhash" : "0x35a3d1d006b3408621b74ab99dd5693dd6d43ede49881f04b36cd4336f57f7f7",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb+31_d0g0v0_Metropolis" : {
+    "mem32kb+31_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/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x57996c1699b00299982c32aad33f2864c917ac9d93009e8e0a8d81ac8ab772b0",
-                    "mixHash" : "0x5606240e30c7d50075b74e18515c499fe727275363d978d0b66e68bd63f8e41a",
-                    "nonce" : "0xdec104b62dc15685",
+                    "hash" : "0x88ec6ae15e142bcf913d5b55f2527aed529f16410565746026ddc79ed0f26479",
+                    "mixHash" : "0x08bde66646f58b6b30b2a087e4d672313ef6f4206969df7e5317d3d31d89e343",
+                    "nonce" : "0x1d474765d0de7289",
                     "number" : "0x01",
                     "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
-                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
-                    "stateRoot" : "0xbbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14",
+                    "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
+                    "stateRoot" : "0x7584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbfcf662ada99cc54914ea511238646bc02aabefcad13544a3fcd8a1960b1f14a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a05606240e30c7d50075b74e18515c499fe727275363d978d0b66e68bd63f8e41a88dec104b62dc15685f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a008bde66646f58b6b30b2a087e4d672313ef6f4206969df7e5317d3d31d89e343881d474765d0de7289f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57996c1699b00299982c32aad33f2864c917ac9d93009e8e0a8d81ac8ab772b0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x88ec6ae15e142bcf913d5b55f2527aed529f16410565746026ddc79ed0f26479",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cff52617cff5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501bf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe37",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cff52617cff5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb+31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb+31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101bf",
+                    "hash" : "0xec285417cbf7f9aa71b5c3c750d2e2228bc6a2bec1f351e533060ccfc847357b",
+                    "mixHash" : "0xaff82f430e23f1986cab18602f2b56063ccc02f03dbea7e6b1cbd2c9953803d1",
+                    "nonce" : "0xac310d5c7041b158",
+                    "number" : "0x01",
+                    "parentHash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
+                    "receiptTrie" : "0x3363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934",
+                    "stateRoot" : "0x7584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa01fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07584b6ea30695db957105785f97489700c1745614bef19bf6de07468fe17cd7fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03363882a64603dee95c948b2343927bb35027816b7becedc1e1cde8b03e41934b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0aff82f430e23f1986cab18602f2b56063ccc02f03dbea7e6b1cbd2c9953803d188ac310d5c7041b158f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x1fb6acff7f7ab31c1a325fbf3ab4012d26ce73cb07bd81294bc20b4df2aa9ab0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xde59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de59dbacd847ddad6ef79cc90aaa39d563369f435aabc8d115970bb9537054f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec285417cbf7f9aa71b5c3c750d2e2228bc6a2bec1f351e533060ccfc847357b",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff52617cff5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+32_d0g0v0.json
index 4ca99ce17..b27b72c8f 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb+32_d0g0v0_EIP150" : {
+    "mem32kb+32_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/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x4608fb3f3677a20c13d0b0384b10ba3d0f3f3b2918767e80e9b0adba992611aa",
-                    "mixHash" : "0x25698df933cea5a1f70b48767e247aa8ece2788560ce0828f283b5c57453e29e",
-                    "nonce" : "0x39337a5c931f3e45",
+                    "hash" : "0x9df8bb14a78e5dbfaa74e1d1be413393173b62afafb53e13b1dc003e96df1965",
+                    "mixHash" : "0xebcf7695e51783d971af67e8419381ccc114afc6e1117bce1b5f485822a727b6",
+                    "nonce" : "0xe4fc3d8ae6469524",
                     "number" : "0x01",
                     "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
-                    "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
-                    "stateRoot" : "0x8d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0f",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0x0d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a025698df933cea5a1f70b48767e247aa8ece2788560ce0828f283b5c57453e29e8839337a5c931f3e45f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0ebcf7695e51783d971af67e8419381ccc114afc6e1117bce1b5f485822a727b688e4fc3d8ae6469524f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4608fb3f3677a20c13d0b0384b10ba3d0f3f3b2918767e80e9b0adba992611aa",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9df8bb14a78e5dbfaa74e1d1be413393173b62afafb53e13b1dc003e96df1965",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0052617d005160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb+32_d0g0v0_EIP158" : {
+    "mem32kb+32_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/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x8197de8b49181dd8f1f06fa9504c8445d42157a035ef8bbd2ec249bda274de5b",
-                    "mixHash" : "0xaadd33e5c108ac902051774f6c8b28cee67456aa31c9f9c34d180336fc8c47a4",
-                    "nonce" : "0x74dc52c19f39011e",
+                    "hash" : "0xea1729f2227b6317d4bcdb2cf5fb7611419c1ddcb757f1b81ba76d3d82a57435",
+                    "mixHash" : "0xe6e82682944514d0661a89e942e383106985f133b35d68f6efee734b95c68440",
+                    "nonce" : "0x2f9787a4d6d4fb9c",
                     "number" : "0x01",
                     "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
-                    "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
-                    "stateRoot" : "0x8d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0f",
+                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
+                    "stateRoot" : "0x0d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0aadd33e5c108ac902051774f6c8b28cee67456aa31c9f9c34d180336fc8c47a48874dc52c19f39011ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0e6e82682944514d0661a89e942e383106985f133b35d68f6efee734b95c68440882f9787a4d6d4fb9cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8197de8b49181dd8f1f06fa9504c8445d42157a035ef8bbd2ec249bda274de5b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xea1729f2227b6317d4bcdb2cf5fb7611419c1ddcb757f1b81ba76d3d82a57435",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0052617d005160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb+32_d0g0v0_Frontier" : {
+    "mem32kb+32_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/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0xc8f507370ff954196323a0939db4ceedfc97bceb14c404a56efbd05013bce6a0",
-                    "mixHash" : "0x0be712b58961ef0e06b51046aa8e07c09bba4aee10d03319aca2e600c1c5f09d",
-                    "nonce" : "0x88ffe7c8ff6d4e01",
+                    "hash" : "0x3578f363d664fa1e7bf9fbf18c2959d44833e29295326cb2f6f75e760d49606f",
+                    "mixHash" : "0x95b5f1453c17d8823ebaac29730d555d6d5fdf0d5d05ad9d5a5b4c286d259c84",
+                    "nonce" : "0x51918e9f011d9893",
                     "number" : "0x01",
                     "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
                     "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a00be712b58961ef0e06b51046aa8e07c09bba4aee10d03319aca2e600c1c5f09d8888ffe7c8ff6d4e01f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a095b5f1453c17d8823ebaac29730d555d6d5fdf0d5d05ad9d5a5b4c286d259c848851918e9f011d9893f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8f507370ff954196323a0939db4ceedfc97bceb14c404a56efbd05013bce6a0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3578f363d664fa1e7bf9fbf18c2959d44833e29295326cb2f6f75e760d49606f",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb+32_d0g0v0_Homestead" : {
+    "mem32kb+32_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/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0x622f45d87c40c82aa7e5ad7b345e2e8d6379f839f8855770d054ad7a5eee8ae8",
-                    "mixHash" : "0x470cfe5ad5c853e833654dc0d1b98396684dfb33ca45a8cf4e2b977b84bf1e55",
-                    "nonce" : "0x7f60b5ec744cb0a8",
+                    "hash" : "0xf5814d359d42c3060bde86085019f31c7f25a12a38a30ac72ea44d817874a5ee",
+                    "mixHash" : "0x3bb0acfe689a179345c99b6effb938997a9c37adab928ab77755c8789df58e14",
+                    "nonce" : "0xbc4f323e9eb6b5d4",
                     "number" : "0x01",
                     "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
                     "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0470cfe5ad5c853e833654dc0d1b98396684dfb33ca45a8cf4e2b977b84bf1e55887f60b5ec744cb0a8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a03bb0acfe689a179345c99b6effb938997a9c37adab928ab77755c8789df58e1488bc4f323e9eb6b5d4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x622f45d87c40c82aa7e5ad7b345e2e8d6379f839f8855770d054ad7a5eee8ae8",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf5814d359d42c3060bde86085019f31c7f25a12a38a30ac72ea44d817874a5ee",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb+32_d0g0v0_Metropolis" : {
+    "mem32kb+32_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/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101bf",
-                    "hash" : "0xb1f4000d1d8f49d98d6edf53bc3a0e4951fbf02153b1a34379a90e270609ba7f",
-                    "mixHash" : "0x90063c0158774faed5c50bf9c4698c92a4a781a80a536dafdebeb190484a24fa",
-                    "nonce" : "0xd5739d43d45fc466",
+                    "hash" : "0xd95b05265e27d95247f67d06bc3e4d6c8ba885d4da3f90d87b2c68517e71f863",
+                    "mixHash" : "0x410218dd38b579246e487a548803c88c95108cc299d9f4d4010b8f5002f1bb90",
+                    "nonce" : "0x45879ae626d36d8b",
                     "number" : "0x01",
                     "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
-                    "receiptTrie" : "0x373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bb",
-                    "stateRoot" : "0x0d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9b",
+                    "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
+                    "stateRoot" : "0x8d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d041d066f97303620f225fb88a4a5ca0318eeec8b79149999cf9fbfc14d7c9ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0373b7008990e7d20d7a1500c44ef581258c87558de705f1af05bfc4b706475bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a090063c0158774faed5c50bf9c4698c92a4a781a80a536dafdebeb190484a24fa88d5739d43d45fc466f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0410218dd38b579246e487a548803c88c95108cc299d9f4d4010b8f5002f1bb908845879ae626d36d8bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1f4000d1d8f49d98d6edf53bc3a0e4951fbf02153b1a34379a90e270609ba7f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd95b05265e27d95247f67d06bc3e4d6c8ba885d4da3f90d87b2c68517e71f863",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d0052617d005160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501bf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe37",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d0052617d005160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb+32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb+32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101bf",
+                    "hash" : "0x81da86f99824982feea8664ec112c57550a34293f347cd8ada7ac635f50d3a79",
+                    "mixHash" : "0xf90d6dbf627a3b497cc6f3ce63d877d3981c3cf62064bc6ecb357aa37e3b4dd4",
+                    "nonce" : "0x71d931ef15696c7e",
+                    "number" : "0x01",
+                    "parentHash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
+                    "receiptTrie" : "0x2a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431",
+                    "stateRoot" : "0x8d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa06e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d620c5238a2766ac292013a95fbd2b4cd6baef549e38dfbfc10022acfba3f0fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa02a123ffa3fc6797f6118bd063b2631879eec65ba1cdff9c994efbbee6257a431b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101bf8203e880a0f90d6dbf627a3b497cc6f3ce63d877d3981c3cf62064bc6ecb357aa37e3b4dd48871d931ef15696c7ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x6e881794416046ca8f383f7ee21fdaaa94c2d861d0970f300c1938d765f34d58",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0589dd0932dae505288cca112680c4cba88e08fe691b13fc1d484edcd3c90cc49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81da86f99824982feea8664ec112c57550a34293f347cd8ada7ac635f50d3a79",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0052617d005160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+33_d0g0v0.json
index 5950a2dad..6788c1631 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb+33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb+33_d0g0v0_EIP150" : {
+    "mem32kb+33_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/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101c5",
-                    "hash" : "0xfa6e9f63b7167cf05b312b7b7c698af4d8c151dc2852693e6c252ca5a9872cc2",
-                    "mixHash" : "0x8cd2cf40f4fbf13fc32acbf5e979c8a02d953fce93753d499abe9d24f3c210b0",
-                    "nonce" : "0x6c020c8ec66e6f39",
+                    "hash" : "0xfda045acfc8384d622b3c25a50892e3f251a7ba725c17f063fa383bc941fb3ad",
+                    "mixHash" : "0x3aca873c4ceba10edfd289b78dd126ee88bbb446534ae334dbce51d18156a260",
+                    "nonce" : "0x92bd5c3fe6050f99",
                     "number" : "0x01",
                     "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
-                    "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
-                    "stateRoot" : "0x1fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960be",
+                    "receiptTrie" : "0x8c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5",
+                    "stateRoot" : "0xe016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a08cd2cf40f4fbf13fc32acbf5e979c8a02d953fce93753d499abe9d24f3c210b0886c020c8ec66e6f39f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa08c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a03aca873c4ceba10edfd289b78dd126ee88bbb446534ae334dbce51d18156a2608892bd5c3fe6050f99f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa6e9f63b7167cf05b312b7b7c698af4d8c151dc2852693e6c252ca5a9872cc2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfda045acfc8384d622b3c25a50892e3f251a7ba725c17f063fa383bc941fb3ad",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0152617d015160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb+33_d0g0v0_EIP158" : {
+    "mem32kb+33_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/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101c5",
-                    "hash" : "0x5497e6cc700b9bd0f4646c9091f749c12b376d812c0838d464143ee96c9cb916",
-                    "mixHash" : "0x0d4b06f95afd4a86189931f7797f3fe64ecdcda1a520b11d6603a2ddb8894756",
-                    "nonce" : "0xdf39b9eabb92e73b",
+                    "hash" : "0x13ff708bc41345d3b7bdba0da5b98305219bc07175d24cc5071e002c4802bfe4",
+                    "mixHash" : "0x2f890a6433facc320b6844d72ead43a2e1b50f709fd2aee7be32cc9102bdffb6",
+                    "nonce" : "0x60e1fe24a5a4e4ed",
                     "number" : "0x01",
                     "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
-                    "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
-                    "stateRoot" : "0x1fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960be",
+                    "receiptTrie" : "0x8c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5",
+                    "stateRoot" : "0xe016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a00d4b06f95afd4a86189931f7797f3fe64ecdcda1a520b11d6603a2ddb889475688df39b9eabb92e73bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa08c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a02f890a6433facc320b6844d72ead43a2e1b50f709fd2aee7be32cc9102bdffb68860e1fe24a5a4e4edf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5497e6cc700b9bd0f4646c9091f749c12b376d812c0838d464143ee96c9cb916",
-        "network" : "EIP158",
+        "lastblockhash" : "0x13ff708bc41345d3b7bdba0da5b98305219bc07175d24cc5071e002c4802bfe4",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0152617d015160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb+33_d0g0v0_Frontier" : {
+    "mem32kb+33_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/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101c5",
-                    "hash" : "0x8297659722a83fe88e52fac6d1b2a8c0e425df16f0954c083f9639f66a769f0d",
-                    "mixHash" : "0x66a309535a1db46e336d1b4ceac16bb24680783ebbb0102455c97540164e4df6",
-                    "nonce" : "0xafd614ed09fb3dc8",
+                    "hash" : "0x61291cd8eaffb3b57a7eb26731b165aa4da229f4bdfe19f1aab13efa39599301",
+                    "mixHash" : "0x32532a089b525be90fd8078536c471b370982b3ae84f45cebdcdd44dcdbcc774",
+                    "nonce" : "0x022bc1dadb875c4e",
                     "number" : "0x01",
                     "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
                     "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a066a309535a1db46e336d1b4ceac16bb24680783ebbb0102455c97540164e4df688afd614ed09fb3dc8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a032532a089b525be90fd8078536c471b370982b3ae84f45cebdcdd44dcdbcc77488022bc1dadb875c4ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8297659722a83fe88e52fac6d1b2a8c0e425df16f0954c083f9639f66a769f0d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x61291cd8eaffb3b57a7eb26731b165aa4da229f4bdfe19f1aab13efa39599301",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb+33_d0g0v0_Homestead" : {
+    "mem32kb+33_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/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101c5",
-                    "hash" : "0xe684db2bf2c7eefd0db59cb29ff2eee96f714f93e068f60acb7d5f933039fa62",
-                    "mixHash" : "0xc5292bc4f86935337693aa94dd3aa02cdbc0de44922f827280d7674043ce3b25",
-                    "nonce" : "0xaaa8805d82357e62",
+                    "hash" : "0xea640ddd3748340bf2ee0a313a363ffa3802bcb69affa61e8187be0b4d0ee225",
+                    "mixHash" : "0x6b9973ff5155ca04b226743ca5306da3bc88cae652a336a4c604181e7b81cea4",
+                    "nonce" : "0xc33c83ddf86570c4",
                     "number" : "0x01",
                     "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
                     "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a0c5292bc4f86935337693aa94dd3aa02cdbc0de44922f827280d7674043ce3b2588aaa8805d82357e62f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a06b9973ff5155ca04b226743ca5306da3bc88cae652a336a4c604181e7b81cea488c33c83ddf86570c4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe684db2bf2c7eefd0db59cb29ff2eee96f714f93e068f60acb7d5f933039fa62",
-        "network" : "Homestead",
+        "lastblockhash" : "0xea640ddd3748340bf2ee0a313a363ffa3802bcb69affa61e8187be0b4d0ee225",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb+33_d0g0v0_Metropolis" : {
+    "mem32kb+33_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/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101c5",
-                    "hash" : "0x1750f9d915cfa7fd71ae1c697297fee9c3f68e9533303996d5ab8692e2a790fa",
-                    "mixHash" : "0xd4c1b22f8dff2e733fb881641e4a5762030b8b1226f5197a7521139bd74b66d0",
-                    "nonce" : "0x0440461bb1f0a0ac",
+                    "hash" : "0x269b61706d96f1ccd92c8c51e0536b9344ec40cecb2020195f8d29fa394e31d3",
+                    "mixHash" : "0x73f1742adaaf713d0d7f36a206e4f69ee6b237f91d2c5f6c653298233b53f789",
+                    "nonce" : "0x9bd0443eaf99f56a",
                     "number" : "0x01",
                     "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
-                    "receiptTrie" : "0x8c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5",
-                    "stateRoot" : "0xe016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83",
+                    "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
+                    "stateRoot" : "0x1fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e016793e22999696477c267c889e0850dbfee49c1d20c5ce69a6cad634a40a83a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa08c681f496070b9c46f24cdbe52ef012e50af6fb59f38a1b1cd3a0e3fd7dce1c5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a0d4c1b22f8dff2e733fb881641e4a5762030b8b1226f5197a7521139bd74b66d0880440461bb1f0a0acf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a073f1742adaaf713d0d7f36a206e4f69ee6b237f91d2c5f6c653298233b53f789889bd0443eaf99f56af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1750f9d915cfa7fd71ae1c697297fee9c3f68e9533303996d5ab8692e2a790fa",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x269b61706d96f1ccd92c8c51e0536b9344ec40cecb2020195f8d29fa394e31d3",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d0152617d015160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d40",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501c5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe31",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d0152617d015160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb+33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb+33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101c5",
+                    "hash" : "0xaea7ad9c6bfaa132748f85747d5d63ac9089eac42fb7772df169f2eafda44a15",
+                    "mixHash" : "0x2e398ed8fa0ee54dd503fd08a8f5e1c5588179d5d909a0a9cfb1cd72101a592c",
+                    "nonce" : "0x78da84717a82251f",
+                    "number" : "0x01",
+                    "parentHash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
+                    "receiptTrie" : "0xd4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83",
+                    "stateRoot" : "0x1fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960be",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa04402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fa5c4066e964d1d3d256499bf2ad133341f5581a417186c7abea1672d5960bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d4e484c7273949279b12a69aceedec4b481d763cf58f5515bb765ffba8f8ac83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101c58203e880a02e398ed8fa0ee54dd503fd08a8f5e1c5588179d5d909a0a9cfb1cd72101a592c8878da84717a82251ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x4402ab54dede7e8eacdbe3053e01c8c2756af857a78745205db4a9bf2e36bc63",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300ba",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d76e61e136ccea4ba9351e670cb176b8a28d05c3b1bc2249b1a8bce061300baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaea7ad9c6bfaa132748f85747d5d63ac9089eac42fb7772df169f2eafda44a15",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d0152617d015160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-1_d0g0v0.json
index 6512aa93f..fc82b6f87 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb-1_d0g0v0_EIP150" : {
+    "mem32kb-1_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/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x840a0487803bdf48265a79067b1f8dad06a40d865e00599630dfdc79585bff53",
-                    "mixHash" : "0x4ed2e911dc443f31689b27532cc6dce96f6c4ee7fbc6c9488a5061ac889a37aa",
-                    "nonce" : "0xa0befb517a4819ba",
+                    "hash" : "0x925a46884a6ba909c066ff31e25e19d4e807821725a05ee76cbbdac47c1bfb37",
+                    "mixHash" : "0xe04d396dc2d9d8c41596ed7b82df2d55837ebe8908cccdad6653188a54e23bee",
+                    "nonce" : "0x47ab50d48bc3ff55",
                     "number" : "0x01",
                     "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
-                    "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
-                    "stateRoot" : "0xa0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547dae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a04ed2e911dc443f31689b27532cc6dce96f6c4ee7fbc6c9488a5061ac889a37aa88a0befb517a4819baf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547daea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0e04d396dc2d9d8c41596ed7b82df2d55837ebe8908cccdad6653188a54e23bee8847ab50d48bc3ff55f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x840a0487803bdf48265a79067b1f8dad06a40d865e00599630dfdc79585bff53",
-        "network" : "EIP150",
+        "lastblockhash" : "0x925a46884a6ba909c066ff31e25e19d4e807821725a05ee76cbbdac47c1bfb37",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf52617cdf5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb-1_d0g0v0_EIP158" : {
+    "mem32kb-1_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/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x2075468778f3332210ed77c5fd01095a4051694ecab346ad51a8a7b7e283c09d",
-                    "mixHash" : "0x397e8006621ebb8c910a93860938787084d35266cd1d4176e105382dba4d47af",
-                    "nonce" : "0x53300a84df0bb64e",
+                    "hash" : "0xf860841893e1427f58185c5c66405488510afec740108ee2aad95faeb344b7a9",
+                    "mixHash" : "0xcf9daaf9e85c407651d3754d9a554c690ed8b105a9c0514270de30121ee31d8a",
+                    "nonce" : "0x9a59cbc7d2c372f3",
                     "number" : "0x01",
                     "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
-                    "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
-                    "stateRoot" : "0xa0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547dae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0397e8006621ebb8c910a93860938787084d35266cd1d4176e105382dba4d47af8853300a84df0bb64ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547daea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0cf9daaf9e85c407651d3754d9a554c690ed8b105a9c0514270de30121ee31d8a889a59cbc7d2c372f3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2075468778f3332210ed77c5fd01095a4051694ecab346ad51a8a7b7e283c09d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf860841893e1427f58185c5c66405488510afec740108ee2aad95faeb344b7a9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf52617cdf5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb-1_d0g0v0_Frontier" : {
+    "mem32kb-1_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/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x5e3b87361c5b7b5f6eb9637ca38c39d17471a52a6196dce1f52fe767ea1cf491",
-                    "mixHash" : "0x5dd8aa3fff0a83eca232aff677eea42a79d8f4140253c8c04baf9a385687f350",
-                    "nonce" : "0x419684f6e63b8d0a",
+                    "hash" : "0xdf77d44b49b0b2a603259b0707937d143693794a00937005b55b14eafcdfb134",
+                    "mixHash" : "0xe09519c9e6321546c389ac197646f077722896aac7677000f7cc14d86b680478",
+                    "nonce" : "0xcf52c84d62d85508",
                     "number" : "0x01",
                     "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
                     "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a05dd8aa3fff0a83eca232aff677eea42a79d8f4140253c8c04baf9a385687f35088419684f6e63b8d0af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0e09519c9e6321546c389ac197646f077722896aac7677000f7cc14d86b68047888cf52c84d62d85508f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e3b87361c5b7b5f6eb9637ca38c39d17471a52a6196dce1f52fe767ea1cf491",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf77d44b49b0b2a603259b0707937d143693794a00937005b55b14eafcdfb134",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb-1_d0g0v0_Homestead" : {
+    "mem32kb-1_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/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0xf982380136b333f188f27070aad5ece97925501b7de7c062628aefe05dd95f6a",
-                    "mixHash" : "0x6461aae81d460ab30cad8bf7887f1d8c54ac6a0c4304b5567ef89b8ddabbb38f",
-                    "nonce" : "0x0b8e74d5f10a31f6",
+                    "hash" : "0x42e10791dcf46295766753c970dda649444cfee06a2669d4e5e2ff874f581259",
+                    "mixHash" : "0xd23f5e97899be36eaa1f69eb97f9357eff3887522a1574796aa201e81f156b5a",
+                    "nonce" : "0x38ecb9358ccd1df8",
                     "number" : "0x01",
                     "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
                     "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a06461aae81d460ab30cad8bf7887f1d8c54ac6a0c4304b5567ef89b8ddabbb38f880b8e74d5f10a31f6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0d23f5e97899be36eaa1f69eb97f9357eff3887522a1574796aa201e81f156b5a8838ecb9358ccd1df8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf982380136b333f188f27070aad5ece97925501b7de7c062628aefe05dd95f6a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x42e10791dcf46295766753c970dda649444cfee06a2669d4e5e2ff874f581259",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb-1_d0g0v0_Metropolis" : {
+    "mem32kb-1_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/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x174359ef00eb85f65d0be4564dfcee26ca1e58e0e9fc7b034129bd45a02249c7",
-                    "mixHash" : "0x146a8c213757651e41febc5aea5a419915fb4741ed179af2e16d2e99ffe6a7f3",
-                    "nonce" : "0x29573abb63d8a5db",
+                    "hash" : "0xa936c310c511ee9c941cc3b0e287485143645658e5c3df39bad2f4f2dfa79ea1",
+                    "mixHash" : "0xea9c972e20d70b28c53ce6a7f8946ad63e2cde0f6fb34af7dbf514a0b97ba9ec",
+                    "nonce" : "0xae53058e8ad02aa1",
                     "number" : "0x01",
                     "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
-                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
-                    "stateRoot" : "0xecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547dae",
+                    "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
+                    "stateRoot" : "0xa0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecba15be252521bc395f8e1a4cb683461670af563c9057496da0d41280547daea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0146a8c213757651e41febc5aea5a419915fb4741ed179af2e16d2e99ffe6a7f38829573abb63d8a5dbf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0ea9c972e20d70b28c53ce6a7f8946ad63e2cde0f6fb34af7dbf514a0b97ba9ec88ae53058e8ad02aa1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x174359ef00eb85f65d0be4564dfcee26ca1e58e0e9fc7b034129bd45a02249c7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa936c310c511ee9c941cc3b0e287485143645658e5c3df39bad2f4f2dfa79ea1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cdf52617cdf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe3e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cdf52617cdf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb-1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb-1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101b8",
+                    "hash" : "0x4f1b59dbd3bd0655b83e38973b81fdeb05f0d1a91a4bb5a8a2bdeeaaef059ec6",
+                    "mixHash" : "0x297cf18539b9f69f9f3f35ce4126f1febcd6e1ea13d3ad4915a9609f50a93a1d",
+                    "nonce" : "0x94f0052d42a5c8df",
+                    "number" : "0x01",
+                    "parentHash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
+                    "receiptTrie" : "0x9a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182c",
+                    "stateRoot" : "0xa0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa08ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0393f52be12dd6a2783dd18c3bffb0a9dcad43abc4d8cb983649d4b8289eea5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09a5a1a5fc9ad805ea2d285eb2dbfa1a9728804805a7599d6842ecb539372182cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0297cf18539b9f69f9f3f35ce4126f1febcd6e1ea13d3ad4915a9609f50a93a1d8894f0052d42a5c8dff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8ad5f38780d8820e262a616233b95f79c8b20f8d20f4de75cb9465b6d408d257",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd97083e000db523e69827312ca27d7b0c5e89a69d193729fc6070e65d8a35da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f1b59dbd3bd0655b83e38973b81fdeb05f0d1a91a4bb5a8a2bdeeaaef059ec6",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf52617cdf5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-31_d0g0v0.json
index f486424af..e677d4c11 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb-31_d0g0v0_EIP150" : {
+    "mem32kb-31_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/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x8445dcd3fdbbf056121877e17816a69e875a2e6a666d8bfa6cf5b3d6cdb90771",
-                    "mixHash" : "0x5ad07fbf7e63652641abaf8b981000da0a4b36bd1d64c28e7d36fc2e68eafb6e",
-                    "nonce" : "0x04e342677997cacf",
+                    "hash" : "0xfd239064070385abe763898945509103ee06c719928b37e17ead198852d94f13",
+                    "mixHash" : "0x87eb425c4e473abee547f169dfe6f7c6c1480d1371d4e298b3cebd05841bc4a5",
+                    "nonce" : "0x8db48db2925c8c9c",
                     "number" : "0x01",
                     "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
-                    "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
-                    "stateRoot" : "0x96598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xe61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a05ad07fbf7e63652641abaf8b981000da0a4b36bd1d64c28e7d36fc2e68eafb6e8804e342677997cacff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a087eb425c4e473abee547f169dfe6f7c6c1480d1371d4e298b3cebd05841bc4a5888db48db2925c8c9cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8445dcd3fdbbf056121877e17816a69e875a2e6a666d8bfa6cf5b3d6cdb90771",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfd239064070385abe763898945509103ee06c719928b37e17ead198852d94f13",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc152617cc15160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb-31_d0g0v0_EIP158" : {
+    "mem32kb-31_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/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x884a654e21212eaad8ec8e489e6040c93d5fa71aa599bbc41c52c43bdda5ab74",
-                    "mixHash" : "0x4fa019b12393bfb93781d5635814201b64439aa4a6ad3f02733730fb1e368223",
-                    "nonce" : "0x90822e789a7fd6a7",
+                    "hash" : "0x8b2e02528a68c4ef80b52ee71fd9d5a47d6032372e9f5357cd51444542b1befe",
+                    "mixHash" : "0x81e64f5835244286ac14f0de0cd4f2e28618d0e81e8a625058e733f5d1f2745f",
+                    "nonce" : "0xf64e2a08e8eeeada",
                     "number" : "0x01",
                     "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
-                    "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
-                    "stateRoot" : "0x96598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xe61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a04fa019b12393bfb93781d5635814201b64439aa4a6ad3f02733730fb1e3682238890822e789a7fd6a7f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a081e64f5835244286ac14f0de0cd4f2e28618d0e81e8a625058e733f5d1f2745f88f64e2a08e8eeeadaf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x884a654e21212eaad8ec8e489e6040c93d5fa71aa599bbc41c52c43bdda5ab74",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8b2e02528a68c4ef80b52ee71fd9d5a47d6032372e9f5357cd51444542b1befe",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc152617cc15160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb-31_d0g0v0_Frontier" : {
+    "mem32kb-31_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/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x6ac9c4c2559475dd4854c2db7d830cbe5c30e4fc8526db47f345dbda38531c27",
-                    "mixHash" : "0x5d8d8376d5f75b96de9d0b19c88e23340771dc4561e30b8bfca83176ddd65154",
-                    "nonce" : "0xd2a33633e459e197",
+                    "hash" : "0xacbe544feb23324efd3f59f0f5682baeffaccb152488c84f5b0e3434ebb6d7fd",
+                    "mixHash" : "0x3857622158830f0f5c6fae8e63c4fd906636d458926a405dc6619c3462660a57",
+                    "nonce" : "0x2f38d90318265fa3",
                     "number" : "0x01",
                     "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
                     "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a05d8d8376d5f75b96de9d0b19c88e23340771dc4561e30b8bfca83176ddd6515488d2a33633e459e197f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a03857622158830f0f5c6fae8e63c4fd906636d458926a405dc6619c3462660a57882f38d90318265fa3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ac9c4c2559475dd4854c2db7d830cbe5c30e4fc8526db47f345dbda38531c27",
-        "network" : "Frontier",
+        "lastblockhash" : "0xacbe544feb23324efd3f59f0f5682baeffaccb152488c84f5b0e3434ebb6d7fd",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb-31_d0g0v0_Homestead" : {
+    "mem32kb-31_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/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x44d50eb48945fdf4d57c6bfd37e023517bb486d2f78592e400b69ab94072222d",
-                    "mixHash" : "0xee6ad0b974cdc9e66dc613ffc685dee578e651642973e5b20fc4d0a19ba894c5",
-                    "nonce" : "0xee645bd0e11e7b6f",
+                    "hash" : "0xb1366f703550e9c1b9f9aa36fc1a543ec6020b9f5467984f5eb6175b6478c26e",
+                    "mixHash" : "0x7dd482e3fc82c48093ef7e84c945094267f69ad59a19826c6b2b048dae17f243",
+                    "nonce" : "0x3a92ccb242c7a5d6",
                     "number" : "0x01",
                     "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
                     "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0ee6ad0b974cdc9e66dc613ffc685dee578e651642973e5b20fc4d0a19ba894c588ee645bd0e11e7b6ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a07dd482e3fc82c48093ef7e84c945094267f69ad59a19826c6b2b048dae17f243883a92ccb242c7a5d6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44d50eb48945fdf4d57c6bfd37e023517bb486d2f78592e400b69ab94072222d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb1366f703550e9c1b9f9aa36fc1a543ec6020b9f5467984f5eb6175b6478c26e",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb-31_d0g0v0_Metropolis" : {
+    "mem32kb-31_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/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x48408447199d197a47b6612ba950df5fabcc5816fa00d096a51f624d2eb6ca29",
-                    "mixHash" : "0x2e76ce513ca7f6b8e9625aae90ce66866c676bc01008f4e9cfabaa9644c721aa",
-                    "nonce" : "0x0b49a3bc3588c739",
+                    "hash" : "0x37a4e8e3cf5c15bb3d5e003d9b8b900ac728e827efb2d84b1339e014dfa46e83",
+                    "mixHash" : "0x73d1e904f80fdee066e049fd4f38658a009e34351137bf1d791c6581bf6661b1",
+                    "nonce" : "0xf8f546106d933e10",
                     "number" : "0x01",
                     "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
-                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
-                    "stateRoot" : "0xe61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887",
+                    "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
+                    "stateRoot" : "0x96598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e61c454d007fcbc7dede3a814a282831464f4f7bdc14c68574f77e7483ed1887a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a02e76ce513ca7f6b8e9625aae90ce66866c676bc01008f4e9cfabaa9644c721aa880b49a3bc3588c739f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a073d1e904f80fdee066e049fd4f38658a009e34351137bf1d791c6581bf6661b188f8f546106d933e10f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48408447199d197a47b6612ba950df5fabcc5816fa00d096a51f624d2eb6ca29",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x37a4e8e3cf5c15bb3d5e003d9b8b900ac728e827efb2d84b1339e014dfa46e83",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cc152617cc15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe3e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cc152617cc15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb-31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb-31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101b8",
+                    "hash" : "0x73dd712c5e92bd5f115541cd28bbb8046371283f30a58774a28dd9ec6e08d8be",
+                    "mixHash" : "0x7d60e9bd2ba915199167af948703cc5c0294ad2ca82fc0e2c2dfe8bde6168b5b",
+                    "nonce" : "0xb9c84819fb2f13c1",
+                    "number" : "0x01",
+                    "parentHash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
+                    "receiptTrie" : "0x109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25",
+                    "stateRoot" : "0x96598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0cee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096598439afece116120008944415869b4a86b761d097fd15d875d08494fbe739a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0109f1736cd1c1573ed821e230758c91b8ed1f7cbd282127538ec8618438f1b25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a07d60e9bd2ba915199167af948703cc5c0294ad2ca82fc0e2c2dfe8bde6168b5b88b9c84819fb2f13c1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xcee3f61f474c707ce0e7f3a95c8f729112fb4541f69b541f1b955715ab0e09b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bab8aa1ba92b3334739c1cd1f60857bb49c71be845ecf1a619be17964375eb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x73dd712c5e92bd5f115541cd28bbb8046371283f30a58774a28dd9ec6e08d8be",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc152617cc15160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-32_d0g0v0.json
index 8a76a7eb6..3817b5f5d 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb-32_d0g0v0_EIP150" : {
+    "mem32kb-32_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/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x08311b7040d39f1416e1f577d1f5e46b359d62578ff9f2fb79abe8d7256bfd8d",
-                    "mixHash" : "0x95837da6f8c2f11b4cfed52d4ce066a420d50b25be0ad40ba6d25a618689d0d9",
-                    "nonce" : "0x7dd8f36c9b8042aa",
+                    "hash" : "0x35ae827870fcf19365fd7eef10e4b54aca4adc7e6ecc9414df768790e0692c0d",
+                    "mixHash" : "0xc1fbb64d27130eedd2de971cacea50d895f664a3161c255a1dd4f6853f54c096",
+                    "nonce" : "0xc0da5dc949572a32",
                     "number" : "0x01",
                     "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
-                    "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
-                    "stateRoot" : "0x85f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2b",
+                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
+                    "stateRoot" : "0xec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a095837da6f8c2f11b4cfed52d4ce066a420d50b25be0ad40ba6d25a618689d0d9887dd8f36c9b8042aaf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0c1fbb64d27130eedd2de971cacea50d895f664a3161c255a1dd4f6853f54c09688c0da5dc949572a32f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08311b7040d39f1416e1f577d1f5e46b359d62578ff9f2fb79abe8d7256bfd8d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x35ae827870fcf19365fd7eef10e4b54aca4adc7e6ecc9414df768790e0692c0d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc052617cc05160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb-32_d0g0v0_EIP158" : {
+    "mem32kb-32_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/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x3007ac30f3c1b67e140edfa56f4496ce09543de158b51e82bc6cdc84e4d390fd",
-                    "mixHash" : "0x4ab32af28189822b6e86c9cb39262e195defee786a4735d170c10a0a6767d7ca",
-                    "nonce" : "0x180819f55bffcf5e",
+                    "hash" : "0xf375cbd8ba4b43ae82986fc889b0392212c2f8a008a016c66456fe96f9cd0d06",
+                    "mixHash" : "0x1e57e472bf4a7c477c6b67ef1f18863c92b972457117db16b525c5ab0ba8a6f2",
+                    "nonce" : "0x6e2ec23b54790460",
                     "number" : "0x01",
                     "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
-                    "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
-                    "stateRoot" : "0x85f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2b",
+                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
+                    "stateRoot" : "0xec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a04ab32af28189822b6e86c9cb39262e195defee786a4735d170c10a0a6767d7ca88180819f55bffcf5ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a01e57e472bf4a7c477c6b67ef1f18863c92b972457117db16b525c5ab0ba8a6f2886e2ec23b54790460f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3007ac30f3c1b67e140edfa56f4496ce09543de158b51e82bc6cdc84e4d390fd",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf375cbd8ba4b43ae82986fc889b0392212c2f8a008a016c66456fe96f9cd0d06",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc052617cc05160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb-32_d0g0v0_Frontier" : {
+    "mem32kb-32_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/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x0e39489a4ab690e49c215a25c1c91121a1e448d46524d5394a44f29f44c29ee6",
-                    "mixHash" : "0x836143c2956b7434db9f69df0036c5d47c2eb7bfadf8b74804c54ba3aefa3689",
-                    "nonce" : "0x37bd84a11c224d23",
+                    "hash" : "0x79fa4d8270c531417e41449f196a26d3a0d0106458b6c29724340faf0e2fb69c",
+                    "mixHash" : "0x23849e04a3a0e2e25fa4dd9e26c6234fae9f8fea7e9276c8109279b7b5b968e8",
+                    "nonce" : "0xf2b4fe16e7fde661",
                     "number" : "0x01",
                     "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
                     "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0836143c2956b7434db9f69df0036c5d47c2eb7bfadf8b74804c54ba3aefa36898837bd84a11c224d23f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a023849e04a3a0e2e25fa4dd9e26c6234fae9f8fea7e9276c8109279b7b5b968e888f2b4fe16e7fde661f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e39489a4ab690e49c215a25c1c91121a1e448d46524d5394a44f29f44c29ee6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x79fa4d8270c531417e41449f196a26d3a0d0106458b6c29724340faf0e2fb69c",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb-32_d0g0v0_Homestead" : {
+    "mem32kb-32_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/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x928d7fb8be576fd4d9724d17caef8b2131120d205a5a1ed5400d9c14ae7bddde",
-                    "mixHash" : "0xf39185446a39dd93ae16eeb531098c4223588c18ac6085cacca2fed754af98e9",
-                    "nonce" : "0x67b7b4a74a7cf199",
+                    "hash" : "0xdc05ed627f2862376f8c4b4e4bd4a667813dde1741adca38967db73b4d0c53fb",
+                    "mixHash" : "0xcb98c18f534098b3a941477a183da8970beb5202a4947c0154d08ff18d46613d",
+                    "nonce" : "0xe3fbdef856acc5e2",
                     "number" : "0x01",
                     "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
                     "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0f39185446a39dd93ae16eeb531098c4223588c18ac6085cacca2fed754af98e98867b7b4a74a7cf199f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0cb98c18f534098b3a941477a183da8970beb5202a4947c0154d08ff18d46613d88e3fbdef856acc5e2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x928d7fb8be576fd4d9724d17caef8b2131120d205a5a1ed5400d9c14ae7bddde",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdc05ed627f2862376f8c4b4e4bd4a667813dde1741adca38967db73b4d0c53fb",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb-32_d0g0v0_Metropolis" : {
+    "mem32kb-32_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/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x65a95e27d2a1033b9e89a38176245f4ec7a93eedc712c892f278b65a8207a0f5",
-                    "mixHash" : "0xde73532289da6d11187c3cef685a7934c73a500293e46cf35718b09c486794c2",
-                    "nonce" : "0xcf7392eca9815749",
+                    "hash" : "0x4512d4f77329d7aad7966a251bc0a9e59befcc5a096fc85776356b2e41672e42",
+                    "mixHash" : "0xfd5b0a9164bf023ba2f4e2ce0d5d6b7eb31bd919df9655d0c8c2aa75aeee8a85",
+                    "nonce" : "0xed6c3f261595d6f6",
                     "number" : "0x01",
                     "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
-                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
-                    "stateRoot" : "0xec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010",
+                    "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
+                    "stateRoot" : "0x85f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec483e47da288b6367a0d8eecd83da41ec8185e451e0ee8b44029d1e446c6010a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0de73532289da6d11187c3cef685a7934c73a500293e46cf35718b09c486794c288cf7392eca9815749f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0fd5b0a9164bf023ba2f4e2ce0d5d6b7eb31bd919df9655d0c8c2aa75aeee8a8588ed6c3f261595d6f6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65a95e27d2a1033b9e89a38176245f4ec7a93eedc712c892f278b65a8207a0f5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4512d4f77329d7aad7966a251bc0a9e59befcc5a096fc85776356b2e41672e42",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cc052617cc05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7ce0",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe45",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cc052617cc05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb-32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb-32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101b1",
+                    "hash" : "0xcafcfe33fbdab2188c310da88ea649af4e7e32c2a5ffe9671a49aa837ad17bbe",
+                    "mixHash" : "0xe4c376b2e065f1d416faa0f7835bd2b8ba5944a5efa86eddf3411d393015e193",
+                    "nonce" : "0xea566d481b246b58",
+                    "number" : "0x01",
+                    "parentHash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
+                    "receiptTrie" : "0x458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884",
+                    "stateRoot" : "0x85f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0a649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085f6e92f489bd5716f8f62269d9106018dfa4036c0ab95462e882f5ea590af2ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0458b5b11aee0a8c221e5795339f46c71f22b334e7457f1e0f84ccc9a25663884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0e4c376b2e065f1d416faa0f7835bd2b8ba5944a5efa86eddf3411d393015e19388ea566d481b246b58f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xa649d2f824496d8149ab39c471c6b632a2af07d8ce5cc13859a2eb5deef8c894",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fc37b0d7d85f968944e23731ca694f6629b10cd89b1eb3e8c5c3d70bc922745a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcafcfe33fbdab2188c310da88ea649af4e7e32c2a5ffe9671a49aa837ad17bbe",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cc052617cc05160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-33_d0g0v0.json
index 6f7a1513e..a124a4a7e 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb-33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb-33_d0g0v0_EIP150" : {
+    "mem32kb-33_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/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x82e2f20fec5f0b65adb106b6bb8952ce1912810301278ccae2bb3754a64c596d",
-                    "mixHash" : "0x206a911dd57989e21f3e66c5d1c4a3301559acd1159c7ea0ef4a68470d55e5ba",
-                    "nonce" : "0xd6654afff79c36bd",
+                    "hash" : "0xc796e8eca4b818ec22b0b071b4b3dcd3ee3e1668cb9aa63e9f30d13ecca8595e",
+                    "mixHash" : "0x7e5a9044ddbdcf5e7b040b5a8e0ba9a2dadcd6a173784aa0915e42489730399c",
+                    "nonce" : "0x4abb89f1ac398431",
                     "number" : "0x01",
                     "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
-                    "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
-                    "stateRoot" : "0x4e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599ca",
+                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
+                    "stateRoot" : "0x12e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0206a911dd57989e21f3e66c5d1c4a3301559acd1159c7ea0ef4a68470d55e5ba88d6654afff79c36bdf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a07e5a9044ddbdcf5e7b040b5a8e0ba9a2dadcd6a173784aa0915e42489730399c884abb89f1ac398431f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82e2f20fec5f0b65adb106b6bb8952ce1912810301278ccae2bb3754a64c596d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc796e8eca4b818ec22b0b071b4b3dcd3ee3e1668cb9aa63e9f30d13ecca8595e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cbf52617cbf5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb-33_d0g0v0_EIP158" : {
+    "mem32kb-33_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/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x70a00be0add44ec478dc81a5de972f121d9af52fec8419e5350e796a3ea105de",
-                    "mixHash" : "0xde6508189f7223c122ec40677143ec947e1cefc9cf0dd50a0597b2bf3327e45d",
-                    "nonce" : "0xf068f3a81f9bc8d1",
+                    "hash" : "0x56da3040a018a49fab0ef0570e28c398f2ba0abcf43ea95b265ab8a9b944911f",
+                    "mixHash" : "0x9655099baa043258f1e4c9f80b32041d506bdf7bf91dd1a8be1c3a911fbdc334",
+                    "nonce" : "0x84915f225ba05972",
                     "number" : "0x01",
                     "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
-                    "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
-                    "stateRoot" : "0x4e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599ca",
+                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
+                    "stateRoot" : "0x12e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0de6508189f7223c122ec40677143ec947e1cefc9cf0dd50a0597b2bf3327e45d88f068f3a81f9bc8d1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a09655099baa043258f1e4c9f80b32041d506bdf7bf91dd1a8be1c3a911fbdc3348884915f225ba05972f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70a00be0add44ec478dc81a5de972f121d9af52fec8419e5350e796a3ea105de",
-        "network" : "EIP158",
+        "lastblockhash" : "0x56da3040a018a49fab0ef0570e28c398f2ba0abcf43ea95b265ab8a9b944911f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cbf52617cbf5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb-33_d0g0v0_Frontier" : {
+    "mem32kb-33_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/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x4dfa0731ad89611cde1db2d219884c733a9e3b194f6d0dc292ea91eb71ce66de",
-                    "mixHash" : "0x10fae997f1bc507f30f9d24302ce89fda1ef6d1e3cd8f55d033611e9b8a3e499",
-                    "nonce" : "0x0b0937d6278b348c",
+                    "hash" : "0x66f3a26007186c3f7f7f393613d94ce2951dc80347aeeb6d51c357686570d557",
+                    "mixHash" : "0x62d6dfb57158c6e260ac0a36caa1dc6ce3ceba47d73ddb19f1937cb3d85be618",
+                    "nonce" : "0xe31548719880b594",
                     "number" : "0x01",
                     "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
                     "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a010fae997f1bc507f30f9d24302ce89fda1ef6d1e3cd8f55d033611e9b8a3e499880b0937d6278b348cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a062d6dfb57158c6e260ac0a36caa1dc6ce3ceba47d73ddb19f1937cb3d85be61888e31548719880b594f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dfa0731ad89611cde1db2d219884c733a9e3b194f6d0dc292ea91eb71ce66de",
-        "network" : "Frontier",
+        "lastblockhash" : "0x66f3a26007186c3f7f7f393613d94ce2951dc80347aeeb6d51c357686570d557",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb-33_d0g0v0_Homestead" : {
+    "mem32kb-33_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/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0xef922a7187a29030571b4e491c68086a17021add91ed84ff554e9616844f2287",
-                    "mixHash" : "0xf9035f3d432b13b98baf00d10ef46846689edff95686e4e56c32378a2aebaf7b",
-                    "nonce" : "0x588d5898adec7f80",
+                    "hash" : "0x40020940dd61ea072159ac6b826a07984d8e1314581a6de096235be7795bf469",
+                    "mixHash" : "0x04dd75ed83fe1962fbda52bc275ec3e574cd5da98faf86e3ab8f21e6a47ebeb2",
+                    "nonce" : "0xeecb55e1fb975366",
                     "number" : "0x01",
                     "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
                     "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0f9035f3d432b13b98baf00d10ef46846689edff95686e4e56c32378a2aebaf7b88588d5898adec7f80f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a004dd75ed83fe1962fbda52bc275ec3e574cd5da98faf86e3ab8f21e6a47ebeb288eecb55e1fb975366f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef922a7187a29030571b4e491c68086a17021add91ed84ff554e9616844f2287",
-        "network" : "Homestead",
+        "lastblockhash" : "0x40020940dd61ea072159ac6b826a07984d8e1314581a6de096235be7795bf469",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb-33_d0g0v0_Metropolis" : {
+    "mem32kb-33_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/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b1",
-                    "hash" : "0x3b6525421b57caa59c9a400fdad20384dca44e47d08721649b84ffacbd6122b8",
-                    "mixHash" : "0x08f8408b9710acddc7163d079a8a5ec25e9224c77167250dbe2731eba2bcf8d4",
-                    "nonce" : "0xf0c8285d5f97e7b7",
+                    "hash" : "0x551482fd84ee9ff6e507e27df5c0cff4d2e88f351a133800be76d6c9d88fdb02",
+                    "mixHash" : "0x217627e6b41eca1ff0cf9b95a90631d3bcca039307a1b7f83dbd44f19c544818",
+                    "nonce" : "0xa16d66da92c9fd55",
                     "number" : "0x01",
                     "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
-                    "receiptTrie" : "0xedd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edc",
-                    "stateRoot" : "0x12e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412f",
+                    "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
+                    "stateRoot" : "0x4e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599ca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e626275edd07cc40963538399f168271877066484be3a3cd55723b5c15412fa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edd30b0d54a4bf475ee35cf4d663f13692555aba2695f58cba7200f5634d7edcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a008f8408b9710acddc7163d079a8a5ec25e9224c77167250dbe2731eba2bcf8d488f0c8285d5f97e7b7f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0217627e6b41eca1ff0cf9b95a90631d3bcca039307a1b7f83dbd44f19c54481888a16d66da92c9fd55f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b6525421b57caa59c9a400fdad20384dca44e47d08721649b84ffacbd6122b8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x551482fd84ee9ff6e507e27df5c0cff4d2e88f351a133800be76d6c9d88fdb02",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cbf52617cbf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7ce0",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe45",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cbf52617cbf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb-33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb-33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101b1",
+                    "hash" : "0x00cdf89b69d00a7c09d17299c2d0118748aca0ec62dd631ba1dd97063293228d",
+                    "mixHash" : "0xd1a89cffd9180c8dd535ed624fd26206d0810a22734d686d23a474279d178e4e",
+                    "nonce" : "0x12701b31c22db297",
+                    "number" : "0x01",
+                    "parentHash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
+                    "receiptTrie" : "0x634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347",
+                    "stateRoot" : "0x4e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599ca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa027d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e1a9cc34c97b4314070ace23087a31d11104b9b43acfabe0c0c55a094a599caa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0634381d78d902b0021d194c37277fec69fe2ddb871ded4a2298117dbbe169347b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b18203e880a0d1a89cffd9180c8dd535ed624fd26206d0810a22734d686d23a474279d178e4e8812701b31c22db297f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x27d8acd8f512bf2339222651ec72f9e616211c5a2bd79c5d5bd0977ec2b0f016",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0899a78592f86a36a51089c643614747150c885d3db90ead022a4b1cdb634a793a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x00cdf89b69d00a7c09d17299c2d0118748aca0ec62dd631ba1dd97063293228d",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cbf52617cbf5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_d0g0v0.json
index 735af5b25..3e01e5eb0 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_d0g0v0_EIP150" : {
+    "mem32kb_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/stMemoryTest/mem32kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x48ab5cce73fa4634c6d6d419bd282ca14cbfc4de6299cba1c1bd8634ed611886",
-                    "mixHash" : "0xa12744b99f41cbb0efed6ccf5395c8acd9c75c39e4cf92f1c3dc0f9fee699a0c",
-                    "nonce" : "0x9910c57fb16b94bf",
+                    "hash" : "0x65a5f0b26f4f16c2ec32d0d5b3924aad9a231b90bbbb7494ab2fbbe54bfb2d70",
+                    "mixHash" : "0x38a82564b8e8241e6260fdab424570e2d90b858ffc1cc117d76c38ad89898c99",
+                    "nonce" : "0x695b306dcd52c302",
                     "number" : "0x01",
                     "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
-                    "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
-                    "stateRoot" : "0x3054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xa0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0a12744b99f41cbb0efed6ccf5395c8acd9c75c39e4cf92f1c3dc0f9fee699a0c889910c57fb16b94bff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a038a82564b8e8241e6260fdab424570e2d90b858ffc1cc117d76c38ad89898c9988695b306dcd52c302f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48ab5cce73fa4634c6d6d419bd282ca14cbfc4de6299cba1c1bd8634ed611886",
-        "network" : "EIP150",
+        "lastblockhash" : "0x65a5f0b26f4f16c2ec32d0d5b3924aad9a231b90bbbb7494ab2fbbe54bfb2d70",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce052617ce05160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem32kb_d0g0v0_EIP158" : {
+    "mem32kb_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/stMemoryTest/mem32kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0xb8ac4558909bcd670eeca8c2ce7cb4f12389d6cbad6513f1b1bc6cf6ba5a7b89",
-                    "mixHash" : "0x75fbbbd78d5b34ebe5b58a7a9f6401dcc0ad8bf789bd6c35098e732e8c25d08a",
-                    "nonce" : "0x8c2995fc502da726",
+                    "hash" : "0x79d03fb8f8a5ee952fec49d510821c3652aa320cdcac5e834d7e7315caf25278",
+                    "mixHash" : "0x4d6b5e5d71cf8554f5f97be0dd81b7b0c2ef97b46a1ff1353ab4463c7e346c61",
+                    "nonce" : "0xd2c3de920a108250",
                     "number" : "0x01",
                     "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
-                    "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
-                    "stateRoot" : "0x3054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810",
+                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
+                    "stateRoot" : "0xa0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a075fbbbd78d5b34ebe5b58a7a9f6401dcc0ad8bf789bd6c35098e732e8c25d08a888c2995fc502da726f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a04d6b5e5d71cf8554f5f97be0dd81b7b0c2ef97b46a1ff1353ab4463c7e346c6188d2c3de920a108250f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8ac4558909bcd670eeca8c2ce7cb4f12389d6cbad6513f1b1bc6cf6ba5a7b89",
-        "network" : "EIP158",
+        "lastblockhash" : "0x79d03fb8f8a5ee952fec49d510821c3652aa320cdcac5e834d7e7315caf25278",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce052617ce05160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem32kb_d0g0v0_Frontier" : {
+    "mem32kb_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/stMemoryTest/mem32kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x14447ef6eb0b3e59ee1941345735151b099c19e6e7484535f21103ecf9d713ca",
-                    "mixHash" : "0xc1777ec2233aab61dec69fab603173cc7a7ff26025f17094a0ad222468660bc8",
-                    "nonce" : "0xdee08a1f944ceea1",
+                    "hash" : "0x97e6c50de885b2b408c9dcd6ca10dfd58e80d6df59459e66551ae997739cd3ec",
+                    "mixHash" : "0x03b9bff923e7c083ce3887c5de7287ea17896fe3877eff11a55857f9a64beab0",
+                    "nonce" : "0x4652f0dfe92093cc",
                     "number" : "0x01",
                     "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
                     "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0c1777ec2233aab61dec69fab603173cc7a7ff26025f17094a0ad222468660bc888dee08a1f944ceea1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a003b9bff923e7c083ce3887c5de7287ea17896fe3877eff11a55857f9a64beab0884652f0dfe92093ccf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14447ef6eb0b3e59ee1941345735151b099c19e6e7484535f21103ecf9d713ca",
-        "network" : "Frontier",
+        "lastblockhash" : "0x97e6c50de885b2b408c9dcd6ca10dfd58e80d6df59459e66551ae997739cd3ec",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem32kb_d0g0v0_Homestead" : {
+    "mem32kb_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/stMemoryTest/mem32kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x41805c39999aa27e42dcf51f1570849cdb79451eebc4b2b7908f5f62165dc03b",
-                    "mixHash" : "0x2879a06708dba58d8cc9ef966a9926fa6e3ff2ace57a60886248321cc9c9250c",
-                    "nonce" : "0x6ff32acc149cc04d",
+                    "hash" : "0xc12b24a2d19a1b0db0a1b07c4e4305b4490b9db01c4944539f501828b898b1df",
+                    "mixHash" : "0xe195e2030e1bbf3f87ef58b5ec4364b14a66d53e3d0de7c62cca89ca5200fc68",
+                    "nonce" : "0x0929e5e94ebb24d2",
                     "number" : "0x01",
                     "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
                     "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a02879a06708dba58d8cc9ef966a9926fa6e3ff2ace57a60886248321cc9c9250c886ff32acc149cc04df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a0e195e2030e1bbf3f87ef58b5ec4364b14a66d53e3d0de7c62cca89ca5200fc68880929e5e94ebb24d2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41805c39999aa27e42dcf51f1570849cdb79451eebc4b2b7908f5f62165dc03b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc12b24a2d19a1b0db0a1b07c4e4305b4490b9db01c4944539f501828b898b1df",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem32kb_d0g0v0_Metropolis" : {
+    "mem32kb_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/stMemoryTest/mem32kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0101b8",
-                    "hash" : "0x02a75c476b239b4a2963b266c7d49023891482e83f87dadf8bf1ca390d6dd8e9",
-                    "mixHash" : "0x7d06d017357dafe3113fdc26211e6783ddf70fc2d629ba44d64c29a504c062ee",
-                    "nonce" : "0x83f9c5df4399efb6",
+                    "hash" : "0x5aea3a62ca8d852842b91e469539aa9687eccb2f75e749cd7e4d728d2190aca7",
+                    "mixHash" : "0x00f09cb9575f0194e3ef1ac58674f2c71f83a6f6665ac4c5e103081b88a42f18",
+                    "nonce" : "0xfe007cf4b5d84214",
                     "number" : "0x01",
                     "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
-                    "receiptTrie" : "0xd26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64",
-                    "stateRoot" : "0xa0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901d",
+                    "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
+                    "stateRoot" : "0x3054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0170ac56e4e27921e258ea11e6306604f1f6d7ef2e661f3e4f462f66551901da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d26e37269f6f7af597c451224463167913f30a04235a825953b0771f92001a64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a07d06d017357dafe3113fdc26211e6783ddf70fc2d629ba44d64c29a504c062ee8883f9c5df4399efb6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a000f09cb9575f0194e3ef1ac58674f2c71f83a6f6665ac4c5e103081b88a42f1888fe007cf4b5d84214f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02a75c476b239b4a2963b266c7d49023891482e83f87dadf8bf1ca390d6dd8e9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5aea3a62ca8d852842b91e469539aa9687eccb2f75e749cd7e4d728d2190aca7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617ce052617ce05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f501b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffefe3e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617ce052617ce05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0101b8",
+                    "hash" : "0x2336c63e4de7d7f24b917caf5ff44847a5ccf59b30af5f93fd964c97d6ca2e5f",
+                    "mixHash" : "0x02d584a05ec69b8df6dab30652d20ce95177b92952574f2b583aec843b5d52cb",
+                    "nonce" : "0x66e521dda07f3fdf",
+                    "number" : "0x01",
+                    "parentHash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
+                    "receiptTrie" : "0x047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9",
+                    "stateRoot" : "0x3054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa071c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03054c5726ab082cc446e43fb4ace200e63d5a2121e5f61c6b27a9189dd353810a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0047669cb7fc113971c4df51a2a6587c2b1f014bbe7e04a3d577d507bbacba7d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830101b88203e880a002d584a05ec69b8df6dab30652d20ce95177b92952574f2b583aec843b5d52cb8866e521dda07f3fdff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x71c84e0a3f36acf80ef6c54066f33833d0714fc1e9aa67961a10e2643aee5e6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3c80e86a742c1b30c9fbe1c5357c08ef5ffc49fc5fdc26c6dd9c2705d796bc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2336c63e4de7d7f24b917caf5ff44847a5ccf59b30af5f93fd964c97d6ca2e5f",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce052617ce05160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1_d0g0v0.json
index 04851cf77..a759c9b61 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte+1_d0g0v0_EIP150" : {
+    "mem32kb_singleByte+1_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/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xf9e6f497f333592f3e9f7fe264b8f911c7e61e89d0d9ada7008da6869c800557",
-                    "mixHash" : "0xbe2bd7856db683a3930efe4878e54d28bf7ab641b9827fb2ed2cdf1723c87f2f",
-                    "nonce" : "0x622555559086e3c2",
+                    "hash" : "0x592b5bbcc6ff4d2b379fd901a0b0eb0737a29f211b50da56490b8ce854c9f95e",
+                    "mixHash" : "0x425369247920aa65fcadfcc67daed0b01de8d59cb570d9267232271873258c5e",
+                    "nonce" : "0x53ca865c653e7150",
                     "number" : "0x01",
                     "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
-                    "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
-                    "stateRoot" : "0x482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0xcf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0be2bd7856db683a3930efe4878e54d28bf7ab641b9827fb2ed2cdf1723c87f2f88622555559086e3c2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0425369247920aa65fcadfcc67daed0b01de8d59cb570d9267232271873258c5e8853ca865c653e7150f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9e6f497f333592f3e9f7fe264b8f911c7e61e89d0d9ada7008da6869c800557",
-        "network" : "EIP150",
+        "lastblockhash" : "0x592b5bbcc6ff4d2b379fd901a0b0eb0737a29f211b50da56490b8ce854c9f95e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d005359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte+1_d0g0v0_EIP158" : {
+    "mem32kb_singleByte+1_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/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xc7a173b794b915d5121d0b8cb8f273a9c00268d2b4f6b3b9559f83d513efd1fc",
-                    "mixHash" : "0x7f237ffe42b1b94b88064cd27291d96c2cae01fe7b72a60aeb98f7d6ea748bca",
-                    "nonce" : "0x3ead809e7baff11b",
+                    "hash" : "0xf4f8342a60a1d3fd6eec23053412400591938d41f45908dd537837956161fa01",
+                    "mixHash" : "0x7448b57720f0ac28c4e57abcbcf1467c47c472c86f51722cdda61adcad939d83",
+                    "nonce" : "0x196cc7bb82aff36e",
                     "number" : "0x01",
                     "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
-                    "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
-                    "stateRoot" : "0x482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0xcf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a07f237ffe42b1b94b88064cd27291d96c2cae01fe7b72a60aeb98f7d6ea748bca883ead809e7baff11bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a07448b57720f0ac28c4e57abcbcf1467c47c472c86f51722cdda61adcad939d8388196cc7bb82aff36ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7a173b794b915d5121d0b8cb8f273a9c00268d2b4f6b3b9559f83d513efd1fc",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf4f8342a60a1d3fd6eec23053412400591938d41f45908dd537837956161fa01",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d005359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte+1_d0g0v0_Frontier" : {
+    "mem32kb_singleByte+1_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/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xab089e8dbdd0444dfafc9f32820beea7f2a3462e964102af00d11068f036e013",
-                    "mixHash" : "0x7e3e9b84dc2fc574b1e7728bd110e1a7a6245de241a1502a53a5e6585f5cdebe",
-                    "nonce" : "0xfd0d8c2221eb843a",
+                    "hash" : "0xfab7a54190e15aeaa1dcd20c0d68799c5444db4d1fe8d72fe214b9e1f4bc9892",
+                    "mixHash" : "0x9ed0833baf684dd04ae48a71bca76c47ff4e9b7b8507c7d749aa42a320191586",
+                    "nonce" : "0x8b18343a92ef6ff4",
                     "number" : "0x01",
                     "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
                     "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a07e3e9b84dc2fc574b1e7728bd110e1a7a6245de241a1502a53a5e6585f5cdebe88fd0d8c2221eb843af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a09ed0833baf684dd04ae48a71bca76c47ff4e9b7b8507c7d749aa42a320191586888b18343a92ef6ff4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab089e8dbdd0444dfafc9f32820beea7f2a3462e964102af00d11068f036e013",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfab7a54190e15aeaa1dcd20c0d68799c5444db4d1fe8d72fe214b9e1f4bc9892",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte+1_d0g0v0_Homestead" : {
+    "mem32kb_singleByte+1_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/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x23ec5b5f7992c1185974a81d58199a06baceb2801dbe8e110c26217b313a0696",
-                    "mixHash" : "0x4cbc659af4f45cc1429c69ed94f80e4eff1a801626de0653b29af90f29362811",
-                    "nonce" : "0x4cc271d3b93c1e3b",
+                    "hash" : "0x4fdec44387583bf17ad6b4d7f5171f3865e1b919a0a0a23a324d7718b4d9db0e",
+                    "mixHash" : "0x47eeec80e4703a14f10097e9a626a817985d90694398636c8f8430e94de245a3",
+                    "nonce" : "0xbc2451a2e3018ee6",
                     "number" : "0x01",
                     "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
                     "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a04cbc659af4f45cc1429c69ed94f80e4eff1a801626de0653b29af90f29362811884cc271d3b93c1e3bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a047eeec80e4703a14f10097e9a626a817985d90694398636c8f8430e94de245a388bc2451a2e3018ee6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23ec5b5f7992c1185974a81d58199a06baceb2801dbe8e110c26217b313a0696",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4fdec44387583bf17ad6b4d7f5171f3865e1b919a0a0a23a324d7718b4d9db0e",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte+1_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte+1_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/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xead8156acb2a3838f28b7ab85f04175f4e8cc05a538cd5217b468196a3c93bdd",
-                    "mixHash" : "0x0d584354ee1729e461f25cfec9883547550f75fca73a97088fb043c52d989efa",
-                    "nonce" : "0xd7f6dfc7993e238e",
+                    "hash" : "0xb6b551137c14b9fd2ac018e86a6fcbd2e4da8d921fad8b7821ef8a88d382860e",
+                    "mixHash" : "0xeb78c0a04d7238bf70523b826adedea39a874797edd0e84a3596158063adb9f5",
+                    "nonce" : "0x1a11ac38a4023d7d",
                     "number" : "0x01",
                     "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
-                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
-                    "stateRoot" : "0xcf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8",
+                    "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
+                    "stateRoot" : "0x482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf56d626af4a519f8dec4eebf5183ca935b6dc564063505655966d860be358a8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a00d584354ee1729e461f25cfec9883547550f75fca73a97088fb043c52d989efa88d7f6dfc7993e238ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0eb78c0a04d7238bf70523b826adedea39a874797edd0e84a3596158063adb9f5881a11ac38a4023d7df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xead8156acb2a3838f28b7ab85f04175f4e8cc05a538cd5217b468196a3c93bdd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb6b551137c14b9fd2ac018e86a6fcbd2e4da8d921fad8b7821ef8a88d382860e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b396",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c60",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte+1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte+1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb396",
+                    "hash" : "0x46f883a5d9fceb60b3af713bd1546eef2004c0a8d5f1f0e6f45298ba07554ab7",
+                    "mixHash" : "0x35b2ef95aa37f4279831c970a9a9105dfd2f759e62673a724ff48d54dd57621c",
+                    "nonce" : "0x6df09ac40cf3537c",
+                    "number" : "0x01",
+                    "parentHash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
+                    "receiptTrie" : "0xedad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8c",
+                    "stateRoot" : "0x482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a03262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482e2312170383a5b92bd212296494476780f1aed41d94195ce41a3ea1cd5ab8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0edad3fd8cd95f64b72f5e1467563c134184980de6c54767c1f681b0c6929de8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a035b2ef95aa37f4279831c970a9a9105dfd2f759e62673a724ff48d54dd57621c886df09ac40cf3537cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x3262ad57a624bcaee0511b6c849e82c984f2689ce3842e159e2faf03f94b5aa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904d7273cccd1987fef6db965b980ab970adf6e797c98472b7ab035f8bcbbd45a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x46f883a5d9fceb60b3af713bd1546eef2004c0a8d5f1f0e6f45298ba07554ab7",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d005359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31_d0g0v0.json
index 78f71dec5..de377c05f 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte+31_d0g0v0_EIP150" : {
+    "mem32kb_singleByte+31_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/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x458fa5c7f180ef2bb104295af219f0037d74522a846e3b3ad316bfc97ee858c1",
-                    "mixHash" : "0x32d317308b9101e0c2b633b17d0cd0acc4acb9dd58b89a16b6405948c07cbff9",
-                    "nonce" : "0x9e43e54e6acfafe4",
+                    "hash" : "0x244e16608173e5a0258a1ab7aa6d2e3b20e75105e841ac9574bc8e0d782ea169",
+                    "mixHash" : "0x44ee1b4b6cb82629d8fe02c50cb9e81d9cf432afb39d6ce7c625723d16f9909d",
+                    "nonce" : "0x461bf3b5dc234e47",
                     "number" : "0x01",
                     "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
-                    "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
-                    "stateRoot" : "0xdcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24c",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0xeda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a032d317308b9101e0c2b633b17d0cd0acc4acb9dd58b89a16b6405948c07cbff9889e43e54e6acfafe4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a044ee1b4b6cb82629d8fe02c50cb9e81d9cf432afb39d6ce7c625723d16f9909d88461bf3b5dc234e47f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x458fa5c7f180ef2bb104295af219f0037d74522a846e3b3ad316bfc97ee858c1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x244e16608173e5a0258a1ab7aa6d2e3b20e75105e841ac9574bc8e0d782ea169",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1e5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte+31_d0g0v0_EIP158" : {
+    "mem32kb_singleByte+31_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/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x6a4d7179d97dbb0563bb3248879d9a5c1da0451a0079b6a3b608ca2b7fb24321",
-                    "mixHash" : "0xd9fde1cda11768f610046523e768293758127cc14152b7af735cebf6c580a756",
-                    "nonce" : "0x1194dc773ac76b22",
+                    "hash" : "0x684d8ca360f8666be3a78d1c6ddf99e86ea4c697317924c5cb0f959b4556330c",
+                    "mixHash" : "0xcef86e760477cc416fedc483631a82754a329d75139d13a57272873a8674cfa7",
+                    "nonce" : "0xcaba8f95c3f5d48b",
                     "number" : "0x01",
                     "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
-                    "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
-                    "stateRoot" : "0xdcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24c",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0xeda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0d9fde1cda11768f610046523e768293758127cc14152b7af735cebf6c580a756881194dc773ac76b22f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0cef86e760477cc416fedc483631a82754a329d75139d13a57272873a8674cfa788caba8f95c3f5d48bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a4d7179d97dbb0563bb3248879d9a5c1da0451a0079b6a3b608ca2b7fb24321",
-        "network" : "EIP158",
+        "lastblockhash" : "0x684d8ca360f8666be3a78d1c6ddf99e86ea4c697317924c5cb0f959b4556330c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1e5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte+31_d0g0v0_Frontier" : {
+    "mem32kb_singleByte+31_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/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x80924e77b85b5c8e8f9dc67331a80e6c817e134da1febeeeeafc052823bf31d1",
-                    "mixHash" : "0x43346a6a17eb70f2ee73ec1d8cbf48c41116e99002bcb3e7094a25d5f9b26a1d",
-                    "nonce" : "0xc1bcf70e74bef9e5",
+                    "hash" : "0x41cf554dc67e8b36ff2e19b95c6c510a61e618fb9abf0147680fc99f193ade06",
+                    "mixHash" : "0x1a135b9e63592fc779ab7bacddecccff6e1cf3457391f523ac2475c67daf34a4",
+                    "nonce" : "0xe5081a3e71e26161",
                     "number" : "0x01",
                     "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
                     "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a043346a6a17eb70f2ee73ec1d8cbf48c41116e99002bcb3e7094a25d5f9b26a1d88c1bcf70e74bef9e5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a01a135b9e63592fc779ab7bacddecccff6e1cf3457391f523ac2475c67daf34a488e5081a3e71e26161f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80924e77b85b5c8e8f9dc67331a80e6c817e134da1febeeeeafc052823bf31d1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x41cf554dc67e8b36ff2e19b95c6c510a61e618fb9abf0147680fc99f193ade06",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte+31_d0g0v0_Homestead" : {
+    "mem32kb_singleByte+31_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/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x5dba9bbb6e9346cca2c3ebc670c770e0ce28ec4812ffdbf067e5fa87d3f56b53",
-                    "mixHash" : "0xd1ee5024bdf075aa4fd07e71d67f6dde7c3d5b10b2a3b47bef4e241e2b902625",
-                    "nonce" : "0x00b1bae5e38b9347",
+                    "hash" : "0x5cf6b16fd69578bd97a41d94d821c8df6e26a04937f2fc319ac873f0d4f714d6",
+                    "mixHash" : "0x496fb977ea627e37959d4c6a10863e8a1d004f7b3db9b713f0f6ab600c1e082c",
+                    "nonce" : "0x1d3d9e477df72bf3",
                     "number" : "0x01",
                     "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
                     "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0d1ee5024bdf075aa4fd07e71d67f6dde7c3d5b10b2a3b47bef4e241e2b9026258800b1bae5e38b9347f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0496fb977ea627e37959d4c6a10863e8a1d004f7b3db9b713f0f6ab600c1e082c881d3d9e477df72bf3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5dba9bbb6e9346cca2c3ebc670c770e0ce28ec4812ffdbf067e5fa87d3f56b53",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5cf6b16fd69578bd97a41d94d821c8df6e26a04937f2fc319ac873f0d4f714d6",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte+31_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte+31_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/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xcc6d3b924cad1627a9f8a2255edca15c0a27535fd986865b0f2117a706ee0f0c",
-                    "mixHash" : "0x88a37b0392e160119e964dbed568a8ced026f363ae64a7bd59fce8f5a33a7717",
-                    "nonce" : "0xb4878fe6e9cc6350",
+                    "hash" : "0x03490a0129616ecdd6523062a49390beee5c485351f1b9ac0ce3589a3b1468dc",
+                    "mixHash" : "0xc96c5780d5525129354cdc971a9e0d66437d62d8d2006b595f0d13654f4a3f66",
+                    "nonce" : "0x3af63a8daa5be787",
                     "number" : "0x01",
                     "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
-                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
-                    "stateRoot" : "0xeda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750",
+                    "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
+                    "stateRoot" : "0xdcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eda0fab714922326f39b59ca470667e255c8b96cac28e7715e795340f8b67750a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a088a37b0392e160119e964dbed568a8ced026f363ae64a7bd59fce8f5a33a771788b4878fe6e9cc6350f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0c96c5780d5525129354cdc971a9e0d66437d62d8d2006b595f0d13654f4a3f66883af63a8daa5be787f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc6d3b924cad1627a9f8a2255edca15c0a27535fd986865b0f2117a706ee0f0c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x03490a0129616ecdd6523062a49390beee5c485351f1b9ac0ce3589a3b1468dc",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d1e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b396",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c60",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d1e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte+31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte+31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb396",
+                    "hash" : "0xf805e430fec18f6ebc3a1fc325fb43b4d04502387f17808640eef4ccde1d866e",
+                    "mixHash" : "0x00b86108b0a0906a1398ca41338dc104f2a8e25148bab7d518f374089833ad19",
+                    "nonce" : "0x390b21710f0b30f6",
+                    "number" : "0x01",
+                    "parentHash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
+                    "receiptTrie" : "0x1df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685b",
+                    "stateRoot" : "0xdcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0fefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcd58710707228f3c9e4988be93dd80163c4f4fd10c615c32f351093943ec24ca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa01df348ead145a15e5a5283322502664c9e9c77c9bed90160ae4641cb88d0685bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a000b86108b0a0906a1398ca41338dc104f2a8e25148bab7d518f374089833ad1988390b21710f0b30f6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xfefa2f9a2236bea4a0fb0b835b80576531505dcb6af9b527f17d2ba66c12ebfb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3a5aaf34a87cadb744055c4c1cf3e7b4df3cd67d20ded7f021cbe91ab6cbd9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf805e430fec18f6ebc3a1fc325fb43b4d04502387f17808640eef4ccde1d866e",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1e5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32_d0g0v0.json
index 8e9371749..34e570c21 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte+32_d0g0v0_EIP150" : {
+    "mem32kb_singleByte+32_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/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x947c8a783214914b2f4a777b01dfee390bccd9a12ddc80763e90b9ca828ddd2e",
-                    "mixHash" : "0xa613d36e7252f8e4a399edbbf3201f1aafd564dc682321eb98f3c20109353c12",
-                    "nonce" : "0x7d531fd6ec5a24b2",
+                    "hash" : "0xf6e820e97fe61d56eebce3d8bacd30a05990b83324e84bf75fd537c218988b8d",
+                    "mixHash" : "0xcf49bcbaf5a3fc1d83be3434e97cf426a9c033083dea9a208fa960da4bf3c2c8",
+                    "nonce" : "0x24c7e63f44a0c9eb",
                     "number" : "0x01",
                     "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
-                    "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
-                    "stateRoot" : "0x559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0x6f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0a613d36e7252f8e4a399edbbf3201f1aafd564dc682321eb98f3c20109353c12887d531fd6ec5a24b2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0cf49bcbaf5a3fc1d83be3434e97cf426a9c033083dea9a208fa960da4bf3c2c88824c7e63f44a0c9ebf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x947c8a783214914b2f4a777b01dfee390bccd9a12ddc80763e90b9ca828ddd2e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf6e820e97fe61d56eebce3d8bacd30a05990b83324e84bf75fd537c218988b8d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1f5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte+32_d0g0v0_EIP158" : {
+    "mem32kb_singleByte+32_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/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xaf0784053c3a7113011055d1a955fb867d0df8af98d125e40e2eb1b418160602",
-                    "mixHash" : "0x67182a7c3b3716df657408017476f0a0bc597541ea0b516c0a374c1233870cb1",
-                    "nonce" : "0x4f0e41f86b789b42",
+                    "hash" : "0xe0d6f83612b6ee05e8d04e98ec8c0f32f800d5ab5cf1ac224cecb494b931eb5b",
+                    "mixHash" : "0xf63796e30e2a53c9fa3b0ce98ece390ad92b2db45634db2d8c3524b297b3f21f",
+                    "nonce" : "0x80b7748d70fd8912",
                     "number" : "0x01",
                     "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
-                    "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
-                    "stateRoot" : "0x559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72",
+                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
+                    "stateRoot" : "0x6f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a067182a7c3b3716df657408017476f0a0bc597541ea0b516c0a374c1233870cb1884f0e41f86b789b42f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0f63796e30e2a53c9fa3b0ce98ece390ad92b2db45634db2d8c3524b297b3f21f8880b7748d70fd8912f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf0784053c3a7113011055d1a955fb867d0df8af98d125e40e2eb1b418160602",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe0d6f83612b6ee05e8d04e98ec8c0f32f800d5ab5cf1ac224cecb494b931eb5b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1f5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte+32_d0g0v0_Frontier" : {
+    "mem32kb_singleByte+32_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/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x904af310fc203027dc408700c4acabfe5e461d0cb58a3c0e3bb9a2f1809fbdad",
-                    "mixHash" : "0x88e2131cea22ee82663788e08e529c976a2d160b9c9dd423d172c1b60d684194",
-                    "nonce" : "0x671065e19889c296",
+                    "hash" : "0xc127eba9e47521af0dd3b09d15b54a45cb59c845910eae035fe25dcff5d1184d",
+                    "mixHash" : "0xba195531f02c253061761009625deb40abdf0dfa89a553a730ffa984dd33481f",
+                    "nonce" : "0x297913e8719275e0",
                     "number" : "0x01",
                     "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
                     "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a088e2131cea22ee82663788e08e529c976a2d160b9c9dd423d172c1b60d68419488671065e19889c296f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a0ba195531f02c253061761009625deb40abdf0dfa89a553a730ffa984dd33481f88297913e8719275e0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x904af310fc203027dc408700c4acabfe5e461d0cb58a3c0e3bb9a2f1809fbdad",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc127eba9e47521af0dd3b09d15b54a45cb59c845910eae035fe25dcff5d1184d",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte+32_d0g0v0_Homestead" : {
+    "mem32kb_singleByte+32_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/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0xc7878c17eda227b9628eb8e6f171fc89e6c1da0e8dd207d9056046ce3e96c934",
-                    "mixHash" : "0x2d8ecd55d79b49d996aeca4c17fcf3a3620161a43aeb7bc5bc9af3574039dede",
-                    "nonce" : "0x4b8136b81b3d53b1",
+                    "hash" : "0x86c8bdab49ab6661ce2a0d4470e5875b24fc983ab0d62bff4d623643b02a758c",
+                    "mixHash" : "0x9dd6bbd1f09789a3246d925b9f17da9a2e29e0dc22b453cc18f91796fafcc703",
+                    "nonce" : "0x32341dadea67a278",
                     "number" : "0x01",
                     "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
                     "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a02d8ecd55d79b49d996aeca4c17fcf3a3620161a43aeb7bc5bc9af3574039dede884b8136b81b3d53b1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a09dd6bbd1f09789a3246d925b9f17da9a2e29e0dc22b453cc18f91796fafcc7038832341dadea67a278f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7878c17eda227b9628eb8e6f171fc89e6c1da0e8dd207d9056046ce3e96c934",
-        "network" : "Homestead",
+        "lastblockhash" : "0x86c8bdab49ab6661ce2a0d4470e5875b24fc983ab0d62bff4d623643b02a758c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte+32_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte+32_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/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb396",
-                    "hash" : "0x3ebcff4b444acbef154cae62f4420c6a87ec6901e06a029c0c83d4c799534afb",
-                    "mixHash" : "0x30c30a2b33d2f98bb9e1f9f074abea016812bd51c8fc35063fd08ee1f1c16008",
-                    "nonce" : "0x280f2e9b06bcfb07",
+                    "hash" : "0x285f8a6bef6d24d95e295e092fa32b7768bf8987a61cbc9cf3ced7a2e484bdee",
+                    "mixHash" : "0x8257426ad205c33da7706c90223a38b444a3dcc3d2628e80fe24b774d1cbd384",
+                    "nonce" : "0x504ceb7728cdc721",
                     "number" : "0x01",
                     "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
-                    "receiptTrie" : "0xf5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2",
-                    "stateRoot" : "0x6f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5",
+                    "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
+                    "stateRoot" : "0x559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f0e300b5ecd267971c24618bb306556538a1b9ecb03a94221536e9f702639b5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f5e050bec8d172a02f861129bc93d9e4c1affd08ef68da756d2b9a0e95afdcf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a030c30a2b33d2f98bb9e1f9f074abea016812bd51c8fc35063fd08ee1f1c1600888280f2e9b06bcfb07f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a08257426ad205c33da7706c90223a38b444a3dcc3d2628e80fe24b774d1cbd38488504ceb7728cdc721f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ebcff4b444acbef154cae62f4420c6a87ec6901e06a029c0c83d4c799534afb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x285f8a6bef6d24d95e295e092fa32b7768bf8987a61cbc9cf3ced7a2e484bdee",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d1f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b396",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c60",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d1f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte+32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte+32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb396",
+                    "hash" : "0xcae4bdc862d1e2e7c3e5a199798bfa54c8778a92241a71ba4263a443b11cfd20",
+                    "mixHash" : "0x8f3628c8ea44f9209280044cfc70c0d051eee620b53b551d1f4e80316d955b87",
+                    "nonce" : "0x436ffad7477aa0ed",
+                    "number" : "0x01",
+                    "parentHash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
+                    "receiptTrie" : "0xaedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407",
+                    "stateRoot" : "0x559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a08297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0559367fbf2a85956d238caf4bfad35371d8308667001230e4f7efd8883cdde72a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0aedc700d4ff84f358be2a25ef6260f3f3de79bb5395719a6ec8893e49b22b407b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3968203e880a08f3628c8ea44f9209280044cfc70c0d051eee620b53b551d1f4e80316d955b8788436ffad7477aa0edf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8297078cc42ec85b758873ddad124b91397a69f310bd7d0831c42bf535b5b567",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ce116433b0066ef19448b28e717d008bc926878d3a7dd63d75008d1b625f5b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcae4bdc862d1e2e7c3e5a199798bfa54c8778a92241a71ba4263a443b11cfd20",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d1f5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33_d0g0v0.json
index 3b91d38cd..a1155668b 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte+33_d0g0v0_EIP150" : {
+    "mem32kb_singleByte+33_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/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb39c",
-                    "hash" : "0xc4d43897b2e4b2f2fc7a895ab8292ccce8ead90b6dcc1e2960109e75c89fcb0d",
-                    "mixHash" : "0x7b4719677234179551ab0c4cfd5ef7f19e95c72fbef8e549a44639307a2c9531",
-                    "nonce" : "0x530372cd4120a915",
+                    "hash" : "0x1631e88c54d572431b0c32c83c7edcd06e84bc54e79919309e7b25326fc04a86",
+                    "mixHash" : "0x36627849715241d64dc13db387f2639307e3dc84245fac058fecf37e0983dfe6",
+                    "nonce" : "0xc74e972d216f1cb3",
                     "number" : "0x01",
                     "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
-                    "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
-                    "stateRoot" : "0x3b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412",
+                    "receiptTrie" : "0x3441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5",
+                    "stateRoot" : "0x655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a07b4719677234179551ab0c4cfd5ef7f19e95c72fbef8e549a44639307a2c953188530372cd4120a915f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a036627849715241d64dc13db387f2639307e3dc84245fac058fecf37e0983dfe688c74e972d216f1cb3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4d43897b2e4b2f2fc7a895ab8292ccce8ead90b6dcc1e2960109e75c89fcb0d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1631e88c54d572431b0c32c83c7edcd06e84bc54e79919309e7b25326fc04a86",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d205359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte+33_d0g0v0_EIP158" : {
+    "mem32kb_singleByte+33_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/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb39c",
-                    "hash" : "0x06c11ef3647ef5ac5c9a9117f6b6ca1222af72618137429704cce0a79aaba311",
-                    "mixHash" : "0x128aa9fa01debefd69319b1e51bf583eceb1559f46f1f21868778f9db217d796",
-                    "nonce" : "0x750cc1cc7945fa4b",
+                    "hash" : "0x21141a225ef891683693e84a3416f064071dc769bdd7fb3ed2585e24f2bd3794",
+                    "mixHash" : "0x9680388006e4e4e3f6efd3ccc599850ad63c14eba10d23d3078fe8ac8f388224",
+                    "nonce" : "0xc03a9e1d16498949",
                     "number" : "0x01",
                     "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
-                    "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
-                    "stateRoot" : "0x3b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412",
+                    "receiptTrie" : "0x3441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5",
+                    "stateRoot" : "0x655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a0128aa9fa01debefd69319b1e51bf583eceb1559f46f1f21868778f9db217d79688750cc1cc7945fa4bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a09680388006e4e4e3f6efd3ccc599850ad63c14eba10d23d3078fe8ac8f38822488c03a9e1d16498949f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06c11ef3647ef5ac5c9a9117f6b6ca1222af72618137429704cce0a79aaba311",
-        "network" : "EIP158",
+        "lastblockhash" : "0x21141a225ef891683693e84a3416f064071dc769bdd7fb3ed2585e24f2bd3794",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d205359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte+33_d0g0v0_Frontier" : {
+    "mem32kb_singleByte+33_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/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb39c",
-                    "hash" : "0x57c9a0f3348c56903f499e338af06c996ec8a6b2d6c6b11cf9c8c1121a5414b8",
-                    "mixHash" : "0x2068606138b0601d6c6254dfe8c118da8bd39d78837a3a52b38c24d603c9ae94",
-                    "nonce" : "0x2abc5a0206f579b9",
+                    "hash" : "0x1de81cd67057325483314c16982a878b5e39257bc1d83ede231208eff950e9e8",
+                    "mixHash" : "0xeacbb1e531b88685097a845be71c90a4c641c43479cb53e1796d4540e9a3a8ad",
+                    "nonce" : "0x961d88ab6daaf5d8",
                     "number" : "0x01",
                     "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
                     "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a02068606138b0601d6c6254dfe8c118da8bd39d78837a3a52b38c24d603c9ae94882abc5a0206f579b9f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a0eacbb1e531b88685097a845be71c90a4c641c43479cb53e1796d4540e9a3a8ad88961d88ab6daaf5d8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57c9a0f3348c56903f499e338af06c996ec8a6b2d6c6b11cf9c8c1121a5414b8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1de81cd67057325483314c16982a878b5e39257bc1d83ede231208eff950e9e8",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte+33_d0g0v0_Homestead" : {
+    "mem32kb_singleByte+33_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/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb39c",
-                    "hash" : "0x8416f33f9bfe49d6c682332fa786ce4b1a65346ff14989821ae09b7b95804a5b",
-                    "mixHash" : "0x1088e6df860b893830a0afc30ab6d483cac0ce4247bec45a02401148e1b5d792",
-                    "nonce" : "0xc8ce4093ab3d713f",
+                    "hash" : "0x2e24d82de860045199609ac5291b94e75f65ac4840c9c81495189c603a604b49",
+                    "mixHash" : "0x789cdf42bf6a6c2c51cb8dd0f9645a10bfa6f5dddfcac804974fba2ebd187f01",
+                    "nonce" : "0x62017a270f35da87",
                     "number" : "0x01",
                     "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
                     "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a01088e6df860b893830a0afc30ab6d483cac0ce4247bec45a02401148e1b5d79288c8ce4093ab3d713ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a0789cdf42bf6a6c2c51cb8dd0f9645a10bfa6f5dddfcac804974fba2ebd187f018862017a270f35da87f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8416f33f9bfe49d6c682332fa786ce4b1a65346ff14989821ae09b7b95804a5b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2e24d82de860045199609ac5291b94e75f65ac4840c9c81495189c603a604b49",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte+33_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte+33_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/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb39c",
-                    "hash" : "0x1bba41386b1e18ec4b08e4b67d622de6481f5ce7887ef431a4288887bfaf6bf9",
-                    "mixHash" : "0xa841ef6c935e338841e08e277734705eaf7020514a3744b5066074170be7690b",
-                    "nonce" : "0x9c3453b0b8200193",
+                    "hash" : "0xfc198d4174459d3f4e9f6041c35deefaa9ab8060742f225e7232ee1916b9779e",
+                    "mixHash" : "0x0f52baba62de7b3f2d5893a422c770345287dbe03e3001df7eb3b512c7cdc9cb",
+                    "nonce" : "0x2774a39a57d00d91",
                     "number" : "0x01",
                     "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
-                    "receiptTrie" : "0x3441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5",
-                    "stateRoot" : "0x655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136",
+                    "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
+                    "stateRoot" : "0x3b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0655197bb658a4b4c04d8d6f3157bf6e5a6318d3c09b4515427bd577692541136a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03441d011ed2be4bc0deff04ac6bff2552b7847ba89de02e55e78bc60607715f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a0a841ef6c935e338841e08e277734705eaf7020514a3744b5066074170be7690b889c3453b0b8200193f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a00f52baba62de7b3f2d5893a422c770345287dbe03e3001df7eb3b512c7cdc9cb882774a39a57d00d91f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1bba41386b1e18ec4b08e4b67d622de6481f5ce7887ef431a4288887bfaf6bf9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfc198d4174459d3f4e9f6041c35deefaa9ab8060742f225e7232ee1916b9779e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617d205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d40"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b39c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c5a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617d205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte+33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte+33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb39c",
+                    "hash" : "0x4f6a7baae0510105b61dc7d643e26627be2629cc242f610468b49df8d9ce9f6d",
+                    "mixHash" : "0x070af058d108bed1148d581859020904975207f4d9d32ebf583ebae434abc2d4",
+                    "nonce" : "0x6d5096b0e30af32e",
+                    "number" : "0x01",
+                    "parentHash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
+                    "receiptTrie" : "0xc40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757c",
+                    "stateRoot" : "0x3b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a05e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b73bef8eabfd00dbb588281c85a918eb26e65018ddb752bc014fae961cfc412a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c40bdaea335c85d571fc6521f4eea07a3a47d0e88b328d2d6db21a2bb47f757cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b39c8203e880a0070af058d108bed1148d581859020904975207f4d9d32ebf583ebae434abc2d4886d5096b0e30af32ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x5e607826f5ffde7056c16c834c2886b253cf363ffcb8fdad8943b98d9c48e31a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc853e1d16b7405ff5428669dc3aa00ebb364e291a57b0172a3e59c26afd65fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f6a7baae0510105b61dc7d643e26627be2629cc242f610468b49df8d9ce9f6d",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617d205359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1_d0g0v0.json
index 14f3b4640..b96414516 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte-1_d0g0v0_EIP150" : {
+    "mem32kb_singleByte-1_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/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x963630368ae572a54e04d7eace069d577da4a43e657f4ad1e6729ad42d2c0727",
-                    "mixHash" : "0x0bbd4dd5d981c9ba7320cc7bc635f10861af5d21eb0d115d53e508fbe8724ac0",
-                    "nonce" : "0xc36ccf301281b7ba",
+                    "hash" : "0x21223462108f51e3fb01aec9843f33c2e888adeb60b45e57df9507f5c83f6c8c",
+                    "mixHash" : "0x0a6133b79f4c870dc9b28d348a34615fbee952352d00d525d071a626a0fec183",
+                    "nonce" : "0x67591fcc85f1511c",
                     "number" : "0x01",
                     "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
-                    "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
-                    "stateRoot" : "0xd322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942d",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0xae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a00bbd4dd5d981c9ba7320cc7bc635f10861af5d21eb0d115d53e508fbe8724ac088c36ccf301281b7baf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a00a6133b79f4c870dc9b28d348a34615fbee952352d00d525d071a626a0fec1838867591fcc85f1511cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x963630368ae572a54e04d7eace069d577da4a43e657f4ad1e6729ad42d2c0727",
-        "network" : "EIP150",
+        "lastblockhash" : "0x21223462108f51e3fb01aec9843f33c2e888adeb60b45e57df9507f5c83f6c8c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cfe5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte-1_d0g0v0_EIP158" : {
+    "mem32kb_singleByte-1_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/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xc4a8e1b49d2649f0e770920bbbe660ec262cd5c4c31f1fdc2092d7daf791fb2d",
-                    "mixHash" : "0x5d4de5404a75f7368b175bc2675440cd5d2bcde8dc6d5683068cf725e958cce7",
-                    "nonce" : "0x7d4377d100f4bdfa",
+                    "hash" : "0x10162b537cad8daa7addde06a9bfa4f8067099670b028d8012c72f05c0b7530e",
+                    "mixHash" : "0x34315a0c72a3ec680f1aa5204a333bb71bf331232680edd4ef5288f11d68dfa4",
+                    "nonce" : "0xca4028011fbbf41b",
                     "number" : "0x01",
                     "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
-                    "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
-                    "stateRoot" : "0xd322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942d",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0xae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a05d4de5404a75f7368b175bc2675440cd5d2bcde8dc6d5683068cf725e958cce7887d4377d100f4bdfaf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a034315a0c72a3ec680f1aa5204a333bb71bf331232680edd4ef5288f11d68dfa488ca4028011fbbf41bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4a8e1b49d2649f0e770920bbbe660ec262cd5c4c31f1fdc2092d7daf791fb2d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x10162b537cad8daa7addde06a9bfa4f8067099670b028d8012c72f05c0b7530e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cfe5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte-1_d0g0v0_Frontier" : {
+    "mem32kb_singleByte-1_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/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x580a4aec4520a9392b4c9c7624ddb24b3cacb51ca249f7df94bd80f1f592ddba",
-                    "mixHash" : "0xcc2734a1544a569ccab0b254574c3b6dda070d680f2d4b48849d78d1e94ab8ea",
-                    "nonce" : "0x3ca056e109148983",
+                    "hash" : "0x5b56060962aa2df369ccf1f9aa6936acb1eab666f39846e36cd82033e1306aea",
+                    "mixHash" : "0x0c4aa5fac6838d6b002a5e700f9a5b83f3c55198c8b2a68ec29c65fb2c2473e2",
+                    "nonce" : "0xb022b8dd1ce84274",
                     "number" : "0x01",
                     "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
                     "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0cc2734a1544a569ccab0b254574c3b6dda070d680f2d4b48849d78d1e94ab8ea883ca056e109148983f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a00c4aa5fac6838d6b002a5e700f9a5b83f3c55198c8b2a68ec29c65fb2c2473e288b022b8dd1ce84274f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x580a4aec4520a9392b4c9c7624ddb24b3cacb51ca249f7df94bd80f1f592ddba",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5b56060962aa2df369ccf1f9aa6936acb1eab666f39846e36cd82033e1306aea",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte-1_d0g0v0_Homestead" : {
+    "mem32kb_singleByte-1_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/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xbb23b77122ea7d44b10ec60998f39b7ecbdbda49159e76323fd78eb953737497",
-                    "mixHash" : "0x3b7bb65d2404ba4c2916fda93844ec653a3216c94390e3bea38a6ef4a6c1fb2e",
-                    "nonce" : "0xb1e842a797e75f5b",
+                    "hash" : "0x5c61a5df2094f0be9a69948e6b08520681d667cc6970c1339776ead17d628811",
+                    "mixHash" : "0x9029d663e98cec007c13706a2ad327701903a12fd430451e868320d82da98c05",
+                    "nonce" : "0xc38ab243d47faae8",
                     "number" : "0x01",
                     "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
                     "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a03b7bb65d2404ba4c2916fda93844ec653a3216c94390e3bea38a6ef4a6c1fb2e88b1e842a797e75f5bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a09029d663e98cec007c13706a2ad327701903a12fd430451e868320d82da98c0588c38ab243d47faae8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb23b77122ea7d44b10ec60998f39b7ecbdbda49159e76323fd78eb953737497",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5c61a5df2094f0be9a69948e6b08520681d667cc6970c1339776ead17d628811",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte-1_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte-1_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/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xe4b3f125ffe1871e305868237c2acf48d8b4f538ed758378846ac0edcc3fac2f",
-                    "mixHash" : "0x23e140f46d29a8139833d64d1c70f13c3d7109affe8ece98e1d3ac9e65112b4a",
-                    "nonce" : "0x0df6adc7f0e1be0b",
+                    "hash" : "0x4531c74e40d12e482581d2c05dc740062955e78b4048c51e76fc6c334d335328",
+                    "mixHash" : "0x54db752a7edc155ffab1c18ce8349c40163aaf47dd0ef4acd58cd93e437fb880",
+                    "nonce" : "0xf1438b8f07c138a8",
                     "number" : "0x01",
                     "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
-                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
-                    "stateRoot" : "0xae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651b",
+                    "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
+                    "stateRoot" : "0xd322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae7bfc5b140beb28dcafe3bcc125708bd1c558a19a8844ba4bbda3a9e696651ba0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a023e140f46d29a8139833d64d1c70f13c3d7109affe8ece98e1d3ac9e65112b4a880df6adc7f0e1be0bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a054db752a7edc155ffab1c18ce8349c40163aaf47dd0ef4acd58cd93e437fb88088f1438b8f07c138a8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4b3f125ffe1871e305868237c2acf48d8b4f538ed758378846ac0edcc3fac2f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4531c74e40d12e482581d2c05dc740062955e78b4048c51e76fc6c334d335328",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cfe5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b38f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c67",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cfe5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte-1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte-1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb38f",
+                    "hash" : "0xf17e9d83bf8a1c252899356e43e40c839359daa1e4473b3589a182e692c9a815",
+                    "mixHash" : "0xef3d9e28196d06e7c71e8f04116deedfd0214cf46d7460ccf733c4b2ae54fc09",
+                    "nonce" : "0x37414e49b3fda5c6",
+                    "number" : "0x01",
+                    "parentHash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
+                    "receiptTrie" : "0x65d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9",
+                    "stateRoot" : "0xd322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0b19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d322b53baf829da0ad43110b39b6bc4eb6d58087199ddd78ae025ade2bc4942da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa065d2ce8ebf1f2eadfd0b26699031e9938d6f875424cc4a112e2c9305604fd9f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0ef3d9e28196d06e7c71e8f04116deedfd0214cf46d7460ccf733c4b2ae54fc098837414e49b3fda5c6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xb19edf4bc90f37e952fdffc199eaf0e455f4c87f8c463d6ef8922316fcb5f026",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b85ea9d3b7b174381aef64d7abb50f66f1f37788a2a4bdb1897b57a5764e5730a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf17e9d83bf8a1c252899356e43e40c839359daa1e4473b3589a182e692c9a815",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cfe5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31_d0g0v0.json
index 20814d04c..bfe07dac8 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte-31_d0g0v0_EIP150" : {
+    "mem32kb_singleByte-31_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/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xe012309be4dfe4632545068efa0f39bb77981f22cf9c0d0846dddeaaf960fbe4",
-                    "mixHash" : "0x45275b4a249a2a04cc43bacaf69209d05848d8b29e5c62a35aa6b5088510e96f",
-                    "nonce" : "0xb7e1a15f40131f70",
+                    "hash" : "0x7d56ed4a6630e64924f0fb1d0b18306e3fe70526427ee56e27cfd07a3dfc3bef",
+                    "mixHash" : "0xfec677ef940ddfc06d846ba4082aeb958bf0bf9e68ad65828804c1c5d6f169e0",
+                    "nonce" : "0xe47c4a38c823538c",
                     "number" : "0x01",
                     "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
-                    "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
-                    "stateRoot" : "0x22c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0x39c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a045275b4a249a2a04cc43bacaf69209d05848d8b29e5c62a35aa6b5088510e96f88b7e1a15f40131f70f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0fec677ef940ddfc06d846ba4082aeb958bf0bf9e68ad65828804c1c5d6f169e088e47c4a38c823538cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe012309be4dfe4632545068efa0f39bb77981f22cf9c0d0846dddeaaf960fbe4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7d56ed4a6630e64924f0fb1d0b18306e3fe70526427ee56e27cfd07a3dfc3bef",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce05359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte-31_d0g0v0_EIP158" : {
+    "mem32kb_singleByte-31_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/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xb17f240a940aa37d3635d5f074e163094b62e3314408ab0506b097915080275c",
-                    "mixHash" : "0x76f934cbb0c1eff5f98817feef2436e81e147266b1fa692e0211493c84bab8c3",
-                    "nonce" : "0x1ffad7252ea8b330",
+                    "hash" : "0x7b212c9fc50fa85425d9932b44bb4b40b948de2f14794db7a13784338894f094",
+                    "mixHash" : "0x516f1830233dbe8d6f3f0b505ffb573c195b7bd91ed9cea26061b8cc34b88470",
+                    "nonce" : "0xac9565b6cac2e98b",
                     "number" : "0x01",
                     "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
-                    "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
-                    "stateRoot" : "0x22c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0x39c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a076f934cbb0c1eff5f98817feef2436e81e147266b1fa692e0211493c84bab8c3881ffad7252ea8b330f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0516f1830233dbe8d6f3f0b505ffb573c195b7bd91ed9cea26061b8cc34b8847088ac9565b6cac2e98bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb17f240a940aa37d3635d5f074e163094b62e3314408ab0506b097915080275c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7b212c9fc50fa85425d9932b44bb4b40b948de2f14794db7a13784338894f094",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce05359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte-31_d0g0v0_Frontier" : {
+    "mem32kb_singleByte-31_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/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xaf1ead10b7035ecaf05f5c77b9b2b4c83c866438af0fb1986167e84072f875d2",
-                    "mixHash" : "0x03de64c4888ec32bafa60d8206602075e0c393870264db861420829f9205268f",
-                    "nonce" : "0xea54446906034589",
+                    "hash" : "0xc870a26306dfa4d9c3d9c9a039aa67d8e4da2b183d239f1d6a27f5ae90815809",
+                    "mixHash" : "0x977b9ccb7bca3ce28be8e21417b52845ed08cb2d736ce0c6f01947f80844c72c",
+                    "nonce" : "0xb75934b7764cc2fc",
                     "number" : "0x01",
                     "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
                     "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a003de64c4888ec32bafa60d8206602075e0c393870264db861420829f9205268f88ea54446906034589f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0977b9ccb7bca3ce28be8e21417b52845ed08cb2d736ce0c6f01947f80844c72c88b75934b7764cc2fcf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf1ead10b7035ecaf05f5c77b9b2b4c83c866438af0fb1986167e84072f875d2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc870a26306dfa4d9c3d9c9a039aa67d8e4da2b183d239f1d6a27f5ae90815809",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte-31_d0g0v0_Homestead" : {
+    "mem32kb_singleByte-31_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/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xef0a2fc113e628f72df7aca3744ebf451085efa850d09c4858907184c97a0106",
-                    "mixHash" : "0xc9585adc989b3c3ed37a34b213ea6d506e2578e95e9c577296a6bb9665eae0bd",
-                    "nonce" : "0x2bf4fdf3a8cae885",
+                    "hash" : "0x1a9e5780e155b4e42853dd3feebfbc289e29c414043f173b38b0cf29eb467952",
+                    "mixHash" : "0xc664f6e4ee98e47b3d86782a024636623a8d98fa3494fb2127af00592ff99777",
+                    "nonce" : "0xc2c7eb6ce9a7ac3b",
                     "number" : "0x01",
                     "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
                     "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0c9585adc989b3c3ed37a34b213ea6d506e2578e95e9c577296a6bb9665eae0bd882bf4fdf3a8cae885f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0c664f6e4ee98e47b3d86782a024636623a8d98fa3494fb2127af00592ff9977788c2c7eb6ce9a7ac3bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef0a2fc113e628f72df7aca3744ebf451085efa850d09c4858907184c97a0106",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1a9e5780e155b4e42853dd3feebfbc289e29c414043f173b38b0cf29eb467952",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte-31_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte-31_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/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x24c79ad6563d7f8d345f39516b45be7cbb590de85c7b2092fe43491f1c79ccbc",
-                    "mixHash" : "0x36b8f40f5b8007ce8dcff4f0e526fbfe7bfa67a385d60c7b1a5cbf5397a34e94",
-                    "nonce" : "0x3408ce4c566dc854",
+                    "hash" : "0x1202cdf3d7c44b11fad4115d7ba58d7e86e307a5468cf7ddc6f7898a426ea8b7",
+                    "mixHash" : "0x752ce6dca38369739d4e0f6fe8eb1c498ffd0d4b0ee6f423182d0fa77117a1b0",
+                    "nonce" : "0x14573eb55def4a0c",
                     "number" : "0x01",
                     "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
-                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
-                    "stateRoot" : "0x39c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9",
+                    "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
+                    "stateRoot" : "0x22c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039c111ba7857243710f8e3e82b8ecd7d569db23a9a1a90733abf80f9d52fc2e9a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a036b8f40f5b8007ce8dcff4f0e526fbfe7bfa67a385d60c7b1a5cbf5397a34e94883408ce4c566dc854f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0752ce6dca38369739d4e0f6fe8eb1c498ffd0d4b0ee6f423182d0fa77117a1b08814573eb55def4a0cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24c79ad6563d7f8d345f39516b45be7cbb590de85c7b2092fe43491f1c79ccbc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1202cdf3d7c44b11fad4115d7ba58d7e86e307a5468cf7ddc6f7898a426ea8b7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617ce05359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b38f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c67",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617ce05359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte-31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte-31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb38f",
+                    "hash" : "0xc7069df3abd38cd7356f2a5b1ba1d79fee751c53a0f163a70902793777fe291b",
+                    "mixHash" : "0x1ece7d9d79dceba6f7cc4414fc958db46cc9392dd6e2b15b1cadcff66fcc9ad0",
+                    "nonce" : "0xfaa24371fc9507b2",
+                    "number" : "0x01",
+                    "parentHash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
+                    "receiptTrie" : "0xc37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8b",
+                    "stateRoot" : "0x22c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a08c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c03bd64b3642d60927e5ad4f4cb78130403d59be12c12e4ee1ad7365ecfa48a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c37c9378bc993511142a37eb0c5555c911beb5c4d1cac0fb00f830a931d8cb8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a01ece7d9d79dceba6f7cc4414fc958db46cc9392dd6e2b15b1cadcff66fcc9ad088faa24371fc9507b2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8c5e0e13939ce96ea1f56763003f1578efd4ac1bcc649f07da41c628fc8aed74",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x34facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034facd50f3ae8299918992d9d658219847a382e0ba02734937f58c24cf62d6a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc7069df3abd38cd7356f2a5b1ba1d79fee751c53a0f163a70902793777fe291b",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617ce05359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32_d0g0v0.json
index 3bbee5d02..46d022564 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte-32_d0g0v0_EIP150" : {
+    "mem32kb_singleByte-32_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/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x167c534a44f2260d880dab52e495ea35a31cd65601c144fd00555c6c4742a001",
-                    "mixHash" : "0x9db394b71f9c2be62384fe6d7212b0a2c0d6cc0821448f3207621c041102c7dc",
-                    "nonce" : "0x50cfa39fd51f6d73",
+                    "hash" : "0xb097f3c43f4b7a5104a055c1d34188956524b1148cf3f1943fad9bd9970eb27b",
+                    "mixHash" : "0x5c947817206f91d61f71003f2778a6b4b1df3389226b129ab50dbec2f57fb2ed",
+                    "nonce" : "0x091c12659f439696",
                     "number" : "0x01",
                     "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
-                    "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
-                    "stateRoot" : "0x1dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x0467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a09db394b71f9c2be62384fe6d7212b0a2c0d6cc0821448f3207621c041102c7dc8850cfa39fd51f6d73f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a05c947817206f91d61f71003f2778a6b4b1df3389226b129ab50dbec2f57fb2ed88091c12659f439696f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x167c534a44f2260d880dab52e495ea35a31cd65601c144fd00555c6c4742a001",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb097f3c43f4b7a5104a055c1d34188956524b1148cf3f1943fad9bd9970eb27b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte-32_d0g0v0_EIP158" : {
+    "mem32kb_singleByte-32_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/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0xa0185bdf29737d8ca40da069cb5b516fdae3798ae5c0753d751f9078a30f36b1",
-                    "mixHash" : "0x617d1edb798fec64ef4c020b12dbe7094c15d1399762f9213f43dd36b7c19b2a",
-                    "nonce" : "0x1eb601c8d6f428eb",
+                    "hash" : "0x3872a1a520746a2cda7dbd7907fc99f91838c27574a0ecccd27269aaa794337f",
+                    "mixHash" : "0x9c86fc2e78727901fe211d46813840afe3075787e518e53640a61ff98bd711b2",
+                    "nonce" : "0x22590bbb0ba8cf26",
                     "number" : "0x01",
                     "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
-                    "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
-                    "stateRoot" : "0x1dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x0467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0617d1edb798fec64ef4c020b12dbe7094c15d1399762f9213f43dd36b7c19b2a881eb601c8d6f428ebf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a09c86fc2e78727901fe211d46813840afe3075787e518e53640a61ff98bd711b28822590bbb0ba8cf26f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0185bdf29737d8ca40da069cb5b516fdae3798ae5c0753d751f9078a30f36b1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3872a1a520746a2cda7dbd7907fc99f91838c27574a0ecccd27269aaa794337f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte-32_d0g0v0_Frontier" : {
+    "mem32kb_singleByte-32_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/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x293c9dad20afd2fc623e9573089047b911fe7fb60a3bad6e848ed94dbf57f49e",
-                    "mixHash" : "0x860f3038279ba35a09e04ea723349cec89ec77d3c21fdc7e570bd59f82427ad5",
-                    "nonce" : "0xab691b8f94e0b81c",
+                    "hash" : "0xce70e04ca8b50b03fd98bb7f2c94c1d2a5a7fd2fe6334b65a47114a2d6ab3c94",
+                    "mixHash" : "0xc94411f5f723236abe077ac41dca03b68817d5b14cd00eb9b60ab563abbc3256",
+                    "nonce" : "0x623c7094feb51c0b",
                     "number" : "0x01",
                     "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
                     "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0860f3038279ba35a09e04ea723349cec89ec77d3c21fdc7e570bd59f82427ad588ab691b8f94e0b81cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0c94411f5f723236abe077ac41dca03b68817d5b14cd00eb9b60ab563abbc325688623c7094feb51c0bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x293c9dad20afd2fc623e9573089047b911fe7fb60a3bad6e848ed94dbf57f49e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xce70e04ca8b50b03fd98bb7f2c94c1d2a5a7fd2fe6334b65a47114a2d6ab3c94",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte-32_d0g0v0_Homestead" : {
+    "mem32kb_singleByte-32_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/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0xedee0995eddd302a90b2d1c909980bfadc96a5c7d7501f9ed984ee66a3cab40b",
-                    "mixHash" : "0x565956846df8f0293f3cdacac9b9e7f4ce7b1f98a2e6f1c0cab9313f098dcd41",
-                    "nonce" : "0xcf4f6c1354d6a240",
+                    "hash" : "0xd1ca07aac5bd6d84158479cff3fe44c626f7c862d576606580686a245ebc4119",
+                    "mixHash" : "0x45032b83653958ccec5b6252e6921bca79dca6ddbede0ea1ebd1f0f8cf85cf09",
+                    "nonce" : "0x939c8e7df5209b98",
                     "number" : "0x01",
                     "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
                     "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0565956846df8f0293f3cdacac9b9e7f4ce7b1f98a2e6f1c0cab9313f098dcd4188cf4f6c1354d6a240f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a045032b83653958ccec5b6252e6921bca79dca6ddbede0ea1ebd1f0f8cf85cf0988939c8e7df5209b98f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedee0995eddd302a90b2d1c909980bfadc96a5c7d7501f9ed984ee66a3cab40b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd1ca07aac5bd6d84158479cff3fe44c626f7c862d576606580686a245ebc4119",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte-32_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte-32_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/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0xfc8c8ef8ca5230f5c73e630535c0f29aa1db8e052a9d8428134ff64f5f490f0b",
-                    "mixHash" : "0xd541209de113ddef27c20573a67ac13553d3532355abea32b238fc2123419909",
-                    "nonce" : "0x2127db8418dd1336",
+                    "hash" : "0x6f6027b2e763e141032e99be3006c243ed4209f4086146acd99c9bd241609dcb",
+                    "mixHash" : "0x73bd9456cc81e6f5f6abb556f1375a2697a8521dd92f78c0ff53a7261b8c637d",
+                    "nonce" : "0xf20b14cd95ff61e4",
                     "number" : "0x01",
                     "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
-                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
-                    "stateRoot" : "0x0467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fc",
+                    "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
+                    "stateRoot" : "0x1dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00467502f04b56eca7d6cc0d52f2fb177752eebc2a3db0a24f686bc770efa57fca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0d541209de113ddef27c20573a67ac13553d3532355abea32b238fc2123419909882127db8418dd1336f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a073bd9456cc81e6f5f6abb556f1375a2697a8521dd92f78c0ff53a7261b8c637d88f20b14cd95ff61e4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc8c8ef8ca5230f5c73e630535c0f29aa1db8e052a9d8428134ff64f5f490f0b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6f6027b2e763e141032e99be3006c243ed4209f4086146acd99c9bd241609dcb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cdf5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7ce0"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b388",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c6e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cdf5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte-32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte-32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb388",
+                    "hash" : "0xcbf1ae490164f3196b2bd342fb0d20664a20a8487fd90abd29c927c903d53e00",
+                    "mixHash" : "0x4de5a0c97d2474687ec011cefa6c67a7b838a9bd7227ad1e3d3b2d965e1d02e8",
+                    "nonce" : "0x013ff12599f60443",
+                    "number" : "0x01",
+                    "parentHash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
+                    "receiptTrie" : "0x6b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51",
+                    "stateRoot" : "0x1dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a08cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dea1b4c7d723478f9061713aa8ac2783809214343c76264a63a6b717fdd7c67a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06b8143b5442ee6c5d3856853370c74b3ac843ecde0b676b5cb9876e021311d51b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a04de5a0c97d2474687ec011cefa6c67a7b838a9bd7227ad1e3d3b2d965e1d02e888013ff12599f60443f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8cf60037e2404501b3eeac008764095e87bacde694b6f9bba7fa69e945394f60",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0104cd694770a73d51fd28982f403157a9252733a856fdd090b0229c7ec7e4784a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcbf1ae490164f3196b2bd342fb0d20664a20a8487fd90abd29c927c903d53e00",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cdf5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33_d0g0v0.json
index b5d34331f..3134781d4 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte-33_d0g0v0_EIP150" : {
+    "mem32kb_singleByte-33_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/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x3c42eae65efa87e52b32bc70bbf65421b93d812a455feac4ef6bbc1cd6341498",
-                    "mixHash" : "0xe63f928512663b0ed23c2abb4ed577de4ca33b03e4c2921d11267e0312281132",
-                    "nonce" : "0xd5a564c149a727cd",
+                    "hash" : "0x6266339a34eb3e979e57cd3d790fd15254e7fac6ea2ae1403aecc338a3bb82f4",
+                    "mixHash" : "0xa84f25713fb882ef4db568111e59ed998d65c4007fb49e95a63f1f7ce0e867cf",
+                    "nonce" : "0xc0338d241536c844",
                     "number" : "0x01",
                     "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
-                    "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
-                    "stateRoot" : "0x94baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1e",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x5be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0e63f928512663b0ed23c2abb4ed577de4ca33b03e4c2921d11267e031228113288d5a564c149a727cdf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0a84f25713fb882ef4db568111e59ed998d65c4007fb49e95a63f1f7ce0e867cf88c0338d241536c844f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c42eae65efa87e52b32bc70bbf65421b93d812a455feac4ef6bbc1cd6341498",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6266339a34eb3e979e57cd3d790fd15254e7fac6ea2ae1403aecc338a3bb82f4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cde5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte-33_d0g0v0_EIP158" : {
+    "mem32kb_singleByte-33_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/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0xb6f5ab5bd0562f0ff5fb79a16ecab9ea6a344c54de0ab96f4a62d041dc8ec3dd",
-                    "mixHash" : "0x90de46d945c1ef85c5f838114c0513310655adb47f5f7754bfa64909be4df370",
-                    "nonce" : "0x09b1c5f10b6ac135",
+                    "hash" : "0x0ae1e664d55ed56ea6e309f20bd4c683eba91d863cf91ae8bd171e9c5700ac6b",
+                    "mixHash" : "0xbdd5486f4647cf840c3ba836bfde07b7a34603d1ca38135927d7463a47688f76",
+                    "nonce" : "0xd99994def1b5e2fe",
                     "number" : "0x01",
                     "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
-                    "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
-                    "stateRoot" : "0x94baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1e",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x5be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a090de46d945c1ef85c5f838114c0513310655adb47f5f7754bfa64909be4df3708809b1c5f10b6ac135f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0bdd5486f4647cf840c3ba836bfde07b7a34603d1ca38135927d7463a47688f7688d99994def1b5e2fef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6f5ab5bd0562f0ff5fb79a16ecab9ea6a344c54de0ab96f4a62d041dc8ec3dd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0ae1e664d55ed56ea6e309f20bd4c683eba91d863cf91ae8bd171e9c5700ac6b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cde5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte-33_d0g0v0_Frontier" : {
+    "mem32kb_singleByte-33_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/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x55bb35d6922a1a05aac01db0a254504fe3866c2d1c1b19879b570ae23c29e965",
-                    "mixHash" : "0x0133dc1d4b1bb4e0a4ec4740752906ab4fc42da93dc1cc42a3ab816b7257370e",
-                    "nonce" : "0x6ec14b0d425a3a37",
+                    "hash" : "0x3aa5121f30eb986542d5b1fe2a6a4c3f5863fa31a7ef8707ac7875ed54b760cf",
+                    "mixHash" : "0xb63578e99692a93996166526de76633a9a87202536c2a3e6baaea534e4b3e42b",
+                    "nonce" : "0xabb4b95af9af5cad",
                     "number" : "0x01",
                     "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
                     "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a00133dc1d4b1bb4e0a4ec4740752906ab4fc42da93dc1cc42a3ab816b7257370e886ec14b0d425a3a37f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0b63578e99692a93996166526de76633a9a87202536c2a3e6baaea534e4b3e42b88abb4b95af9af5cadf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55bb35d6922a1a05aac01db0a254504fe3866c2d1c1b19879b570ae23c29e965",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3aa5121f30eb986542d5b1fe2a6a4c3f5863fa31a7ef8707ac7875ed54b760cf",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte-33_d0g0v0_Homestead" : {
+    "mem32kb_singleByte-33_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/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x1ab41715c4614bd8027d2976af777ca3f02301479ca8e2ea80477f51dce1ebfb",
-                    "mixHash" : "0xe30354ab1664a56360873a55f5fa66441777971923531b593dc0ffcfa23f9eb8",
-                    "nonce" : "0xb0351787f7f123a3",
+                    "hash" : "0x981a82ca53d9052b1733c44b0e3fe584add8b906f7bb4f0168fd54be6067a7ab",
+                    "mixHash" : "0x311e9862ce056012935257409bc8f5f03c5234c1630a6de9d80e687066a08e7b",
+                    "nonce" : "0x438a9f4b49c8d18d",
                     "number" : "0x01",
                     "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
                     "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0e30354ab1664a56360873a55f5fa66441777971923531b593dc0ffcfa23f9eb888b0351787f7f123a3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0311e9862ce056012935257409bc8f5f03c5234c1630a6de9d80e687066a08e7b88438a9f4b49c8d18df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ab41715c4614bd8027d2976af777ca3f02301479ca8e2ea80477f51dce1ebfb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x981a82ca53d9052b1733c44b0e3fe584add8b906f7bb4f0168fd54be6067a7ab",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte-33_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte-33_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/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb388",
-                    "hash" : "0x6026730f670f89bb4815dc4163be4b9f4f1b1a148ce8ec1b94817e8948dc609f",
-                    "mixHash" : "0xbe00b1737c5b5aa7a82d6f14c93722f21e18ffd93d8df60e012530ed0747fac7",
-                    "nonce" : "0xf4d38932158f2c5c",
+                    "hash" : "0x5c18a95f28c2cdd3e1214e47322e2c3206e2e0fdbeda6dc5d39e9e3c55168380",
+                    "mixHash" : "0x1fbe1dd2414286864feb64568f80b120792bb1c49bca0618f04fbc94888547e1",
+                    "nonce" : "0x50d92cf4d8f367da",
                     "number" : "0x01",
                     "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
-                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
-                    "stateRoot" : "0x5be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8",
+                    "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
+                    "stateRoot" : "0x94baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05be12a607f901fc43f0df225612ce12c018b070873edcc0a0677cfa1f127ebb8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a0be00b1737c5b5aa7a82d6f14c93722f21e18ffd93d8df60e012530ed0747fac788f4d38932158f2c5cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a01fbe1dd2414286864feb64568f80b120792bb1c49bca0618f04fbc94888547e18850d92cf4d8f367daf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6026730f670f89bb4815dc4163be4b9f4f1b1a148ce8ec1b94817e8948dc609f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5c18a95f28c2cdd3e1214e47322e2c3206e2e0fdbeda6dc5d39e9e3c55168380",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cde5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7ce0"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b388",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c6e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cde5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte-33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte-33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb388",
+                    "hash" : "0x97d6b2c736daa9f45abbb10f2274634f7ff097dc23fa1c01759fe8391c4bd9eb",
+                    "mixHash" : "0x5d2cca85be9f3b1fb01afc9d93bbc552b96bc2e90ddd4fd88bdf353c53407f40",
+                    "nonce" : "0x7d708eac483e40d7",
+                    "number" : "0x01",
+                    "parentHash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
+                    "receiptTrie" : "0xa8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aec",
+                    "stateRoot" : "0x94baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0b5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094baf1a7715679ff2358d9b467c8727986ac123bb678291f47d1515ebdddcb1ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a8563bbb48115e43f693db98939c5a2427525c15497445c6e6645096f7796aecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b3888203e880a05d2cca85be9f3b1fb01afc9d93bbc552b96bc2e90ddd4fd88bdf353c53407f40887d708eac483e40d7f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xb5a0bfe87c1bfee4c322a77f45755ed17a79958342117d23e473a7256422dbfd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aedd71095d51769e329a1eda2eea282f1a3612c53e38c9108b9585c2990874cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x97d6b2c736daa9f45abbb10f2274634f7ff097dc23fa1c01759fe8391c4bd9eb",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cde5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte_d0g0v0.json
index d779600a6..7f5bf5d40 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem32kb_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem32kb_singleByte_d0g0v0_EIP150" : {
+    "mem32kb_singleByte_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/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x0de44023e44ef20fba83d63a2957aaacbe7c3619ae9cbee210e9bfd679d85225",
-                    "mixHash" : "0x7a910aebee94fe68ea46a4b371d07e7c66b2737f97391fa164773327f32321fd",
-                    "nonce" : "0x2a421c733c47823b",
+                    "hash" : "0x734ca4d4bac0940320d6fb65b3f5443adc65c601e417cbbac083e9a9ff2a36ce",
+                    "mixHash" : "0x6f11a23d6095475836fd19df6899e9e9d58c84c3d550dbef3ec47141fb145012",
+                    "nonce" : "0x31a8b5958d6cb1b2",
                     "number" : "0x01",
                     "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
-                    "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
-                    "stateRoot" : "0x44c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0xf7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a07a910aebee94fe68ea46a4b371d07e7c66b2737f97391fa164773327f32321fd882a421c733c47823bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aaa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a06f11a23d6095475836fd19df6899e9e9d58c84c3d550dbef3ec47141fb1450128831a8b5958d6cb1b2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0de44023e44ef20fba83d63a2957aaacbe7c3619ae9cbee210e9bfd679d85225",
-        "network" : "EIP150",
+        "lastblockhash" : "0x734ca4d4bac0940320d6fb65b3f5443adc65c601e417cbbac083e9a9ff2a36ce",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem32kb_singleByte_d0g0v0_EIP158" : {
+    "mem32kb_singleByte_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/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x996945615c880df3de80598f4845515d991858f152e9d1be24c42d9254777d5e",
-                    "mixHash" : "0x52ce5b2ee166b1e1133a218c75d04198bdf4f1a685c2ca20c208bcaa9f2d7f54",
-                    "nonce" : "0x9a4df70f08fbb32b",
+                    "hash" : "0x00c462fdf24ee962bafe148bf96b00f0904af3056625276a05320657775fbb8b",
+                    "mixHash" : "0x299a2103cdf2bf398c63ded7f760bb0a4f02429c409d92b8d9c09f26830ff2b4",
+                    "nonce" : "0x7c2726ace17b5d0a",
                     "number" : "0x01",
                     "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
-                    "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
-                    "stateRoot" : "0x44c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492",
+                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
+                    "stateRoot" : "0xf7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a052ce5b2ee166b1e1133a218c75d04198bdf4f1a685c2ca20c208bcaa9f2d7f54889a4df70f08fbb32bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aaa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0299a2103cdf2bf398c63ded7f760bb0a4f02429c409d92b8d9c09f26830ff2b4887c2726ace17b5d0af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x996945615c880df3de80598f4845515d991858f152e9d1be24c42d9254777d5e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00c462fdf24ee962bafe148bf96b00f0904af3056625276a05320657775fbb8b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem32kb_singleByte_d0g0v0_Frontier" : {
+    "mem32kb_singleByte_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/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x10613b243576de44f5fdc50d9d5e109a30e794c84164e0b3660d5b747c16b5f0",
-                    "mixHash" : "0x5cd35af485cb205792d9c1a34b5fcf3cce3a1b8cbfbe0461bfa0a23ccab7fb00",
-                    "nonce" : "0xc691042346196072",
+                    "hash" : "0x16d558cf869910ad1b08e21f88b2fff9643968eee393c70bb0e79132ea64ba02",
+                    "mixHash" : "0x4e959ee8fdcd1c0dfcef78fffd767b9c311b85dfeb7399d8049a5fff9997756d",
+                    "nonce" : "0x70a7f3a88ce6458c",
                     "number" : "0x01",
                     "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
                     "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a05cd35af485cb205792d9c1a34b5fcf3cce3a1b8cbfbe0461bfa0a23ccab7fb0088c691042346196072f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a04e959ee8fdcd1c0dfcef78fffd767b9c311b85dfeb7399d8049a5fff9997756d8870a7f3a88ce6458cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10613b243576de44f5fdc50d9d5e109a30e794c84164e0b3660d5b747c16b5f0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x16d558cf869910ad1b08e21f88b2fff9643968eee393c70bb0e79132ea64ba02",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem32kb_singleByte_d0g0v0_Homestead" : {
+    "mem32kb_singleByte_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/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0xf540ede8676d42569b20f44b52be784547f82d4f229470f18cc3fd9a52bd7959",
-                    "mixHash" : "0x520cb2711d5f2a296425698d75ab2021ca13116c3ad7a8b8bfe1a45db86b801b",
-                    "nonce" : "0xd9bf40201ae6ae4c",
+                    "hash" : "0xa388774baa36c1b26d61e3d69cc5d3e7064db98bca9564acbcf25f654589b84a",
+                    "mixHash" : "0x56001b9387e978594e884899e4e0e6f2bcfff6523329c00fe209e6fe99686e15",
+                    "nonce" : "0x7868b9e08a569f9c",
                     "number" : "0x01",
                     "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
                     "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0520cb2711d5f2a296425698d75ab2021ca13116c3ad7a8b8bfe1a45db86b801b88d9bf40201ae6ae4cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a056001b9387e978594e884899e4e0e6f2bcfff6523329c00fe209e6fe99686e15887868b9e08a569f9cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf540ede8676d42569b20f44b52be784547f82d4f229470f18cc3fd9a52bd7959",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa388774baa36c1b26d61e3d69cc5d3e7064db98bca9564acbcf25f654589b84a",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem32kb_singleByte_d0g0v0_Metropolis" : {
+    "mem32kb_singleByte_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/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xb38f",
-                    "hash" : "0x0da85a3e8b75be5b07b18bc9fafc7cad6fd077a57d7b0dd27641577da738ca30",
-                    "mixHash" : "0x2b600fd9976b25a5b2957ebc9ddc1d645429ca9d888db92d9d0319a47a850c95",
-                    "nonce" : "0x326ab4bafe30dfbe",
+                    "hash" : "0xfdb6c68b8b7738397d1c375dc7b92eac8f7437a6de2957472f4a6a21bfab27ec",
+                    "mixHash" : "0xc60e9102ecaa59a9639fafd62af7f1d7526d3a83c1440f33de577f7dda7e7ed2",
+                    "nonce" : "0x9d3c8dcc3d149af6",
                     "number" : "0x01",
                     "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
-                    "receiptTrie" : "0x3f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcd",
-                    "stateRoot" : "0xf7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aa",
+                    "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
+                    "stateRoot" : "0x44c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7c0feeca2f4670d2c75f8458d07dfe728efd6a30b1f8193569d739fc27d84aaa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa03f2cc1d6a9ed13dc4cbedc1787c605357d4d1e5dac7ce792631d9a7535e63dcdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a02b600fd9976b25a5b2957ebc9ddc1d645429ca9d888db92d9d0319a47a850c9588326ab4bafe30dfbef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0c60e9102ecaa59a9639fafd62af7f1d7526d3a83c1440f33de577f7dda7e7ed2889d3c8dcc3d149af6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0da85a3e8b75be5b07b18bc9fafc7cad6fd077a57d7b0dd27641577da738ca30",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfdb6c68b8b7738397d1c375dc7b92eac8f7437a6de2957472f4a6a21bfab27ec",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a617cff5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7d00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b38f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff4c67",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a617cff5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem32kb_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem32kb_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xb38f",
+                    "hash" : "0x9443f64b3f9ba4a2f9ca07dfeef612baaef9ff45371e3c18c2c97341dcd1cb56",
+                    "mixHash" : "0xba954fed3742f3998a1833a08f445a49aa5818e16de5cec8f569bee308d86e39",
+                    "nonce" : "0x899a584d3b259f76",
+                    "number" : "0x01",
+                    "parentHash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
+                    "receiptTrie" : "0x75f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98",
+                    "stateRoot" : "0x44c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0e6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044c17bcdfaab0d7b286e849a316c2d3ba5305001a34397607a51f7a8a7d82492a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa075f29313ba9677cb706ce81686cc8e70b9f4251af15a379a1388a28c94dfde98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082b38f8203e880a0ba954fed3742f3998a1833a08f445a49aa5818e16de5cec8f569bee308d86e3988899a584d3b259f76f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xe6ba1a70ed367f3205333f50e250de619b998f16ab13ee309fa1124d3ab0696a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x15dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015dff1a6d0db629004e23f332abe2864456bd145eaf4bbf2cac03851ddf57855a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9443f64b3f9ba4a2f9ca07dfeef612baaef9ff45371e3c18c2c97341dcd1cb56",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a617cff5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem33b_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem33b_singleByte_d0g0v0.json
index 4c3f18b87..1d414e859 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem33b_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem33b_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem33b_singleByte_d0g0v0_EIP150" : {
+    "mem33b_singleByte_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/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa03c",
-                    "hash" : "0x3471f70a5f0ca13beace56fec74d91ff330b2252e8c532e14d49f09b615fe72e",
-                    "mixHash" : "0x76d0535ebbe84cd3794523f87a2b067a43076a9a48314daacd7da8a288d1f40e",
-                    "nonce" : "0x54f7fb3213c62cf8",
+                    "hash" : "0x77b7f88f713eb0e3c6601d478dc880dcb16da42adf3956ffcea92ddc043890ac",
+                    "mixHash" : "0x19eedadbcb23afc1c28d3819664d3a19fcd501d793f8820b7f4f5bb33e23065f",
+                    "nonce" : "0x4805a2d983d3f7f5",
                     "number" : "0x01",
                     "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
-                    "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
-                    "stateRoot" : "0xa407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8",
+                    "receiptTrie" : "0xd0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1",
+                    "stateRoot" : "0x892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a076d0535ebbe84cd3794523f87a2b067a43076a9a48314daacd7da8a288d1f40e8854f7fb3213c62cf8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a019eedadbcb23afc1c28d3819664d3a19fcd501d793f8820b7f4f5bb33e23065f884805a2d983d3f7f5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3471f70a5f0ca13beace56fec74d91ff330b2252e8c532e14d49f09b615fe72e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x77b7f88f713eb0e3c6601d478dc880dcb16da42adf3956ffcea92ddc043890ac",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60205359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem33b_singleByte_d0g0v0_EIP158" : {
+    "mem33b_singleByte_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/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa03c",
-                    "hash" : "0x0f06ff290858b6d22be3da46d632555bd9cab173aa44476f072f273db6c81bdc",
-                    "mixHash" : "0xd1a6e6edabed8e25869f3821107dbde2c202092809ff6cda00e8f47631437f94",
-                    "nonce" : "0xbc64fa38568b0a5d",
+                    "hash" : "0x4c67cc16afddd8014ecfd330391c46c92209e3b366190dac131657ca42686203",
+                    "mixHash" : "0x51907f30b7f21af804bd2695ff0dbebb554f0e9554c49601b262250278785506",
+                    "nonce" : "0xa52c8f95e1c452d2",
                     "number" : "0x01",
                     "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
-                    "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
-                    "stateRoot" : "0xa407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8",
+                    "receiptTrie" : "0xd0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1",
+                    "stateRoot" : "0x892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a0d1a6e6edabed8e25869f3821107dbde2c202092809ff6cda00e8f47631437f9488bc64fa38568b0a5df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a051907f30b7f21af804bd2695ff0dbebb554f0e9554c49601b26225027878550688a52c8f95e1c452d2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f06ff290858b6d22be3da46d632555bd9cab173aa44476f072f273db6c81bdc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4c67cc16afddd8014ecfd330391c46c92209e3b366190dac131657ca42686203",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60205359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem33b_singleByte_d0g0v0_Frontier" : {
+    "mem33b_singleByte_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/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa03c",
-                    "hash" : "0x148251b49682ecb51c0dbdd4968df4e3f7fec172f094fb9098f252b6adbfb04b",
-                    "mixHash" : "0x77179e2171387b59f002b5cdd8e65d594036c066dc6e3a5625d4b5ddde30c3d6",
-                    "nonce" : "0x7bb4ac17b7527d87",
+                    "hash" : "0x26a8b032dff362ae69addb1fbca7cd111af49abc055c34d5c553ff80bdbdf24e",
+                    "mixHash" : "0xa05b31f40eb749ad1ee19f2a17542228bc72408158945ed95cbef722b637db32",
+                    "nonce" : "0xcc4724448516016c",
                     "number" : "0x01",
                     "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
                     "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a077179e2171387b59f002b5cdd8e65d594036c066dc6e3a5625d4b5ddde30c3d6887bb4ac17b7527d87f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a0a05b31f40eb749ad1ee19f2a17542228bc72408158945ed95cbef722b637db3288cc4724448516016cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x148251b49682ecb51c0dbdd4968df4e3f7fec172f094fb9098f252b6adbfb04b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x26a8b032dff362ae69addb1fbca7cd111af49abc055c34d5c553ff80bdbdf24e",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem33b_singleByte_d0g0v0_Homestead" : {
+    "mem33b_singleByte_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/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa03c",
-                    "hash" : "0xacb1e53933d3eb67d1a6d3ad51594bbb2ebf0b4fe6c74cba4cc8309633dd94af",
-                    "mixHash" : "0xe7b8fcd9c96d8e0bcf63c8ff3312291f227ea2bb9d0b703430ae3ac9f2a88ab6",
-                    "nonce" : "0xcaa076544672e94d",
+                    "hash" : "0x1c6856f95ca9c3a8b3a8bf984ee128ed80cbf42bc50eadfd874695f450a201e7",
+                    "mixHash" : "0xc5f944fbd86797847e826d0f1ddf2c81ecd69d71dac6627a0fd80d5d67689896",
+                    "nonce" : "0x31d1c8c794a89b02",
                     "number" : "0x01",
                     "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
                     "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a0e7b8fcd9c96d8e0bcf63c8ff3312291f227ea2bb9d0b703430ae3ac9f2a88ab688caa076544672e94df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a0c5f944fbd86797847e826d0f1ddf2c81ecd69d71dac6627a0fd80d5d676898968831d1c8c794a89b02f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacb1e53933d3eb67d1a6d3ad51594bbb2ebf0b4fe6c74cba4cc8309633dd94af",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1c6856f95ca9c3a8b3a8bf984ee128ed80cbf42bc50eadfd874695f450a201e7",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem33b_singleByte_d0g0v0_Metropolis" : {
+    "mem33b_singleByte_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/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xa03c",
-                    "hash" : "0xc32ec5652d4709591dc1621b0a174333664182504b4dde7c6f4ab349d443af7b",
-                    "mixHash" : "0x5700a487b3b4cf3bff8313af41aadb53d3eefdccd53883c2dc29fc598b1db189",
-                    "nonce" : "0x6ca7a5b4d97a752e",
+                    "hash" : "0x26766a827285a79bd3a25a8e78deecc77a2f1978d3eedda2b14a568e37c528c4",
+                    "mixHash" : "0x42c352b324e8f7578f4b83097183490828f83fe9f0209a0354b7d82af180eda9",
+                    "nonce" : "0xd703af5f07fb5b8d",
                     "number" : "0x01",
                     "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
-                    "receiptTrie" : "0xd0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1",
-                    "stateRoot" : "0x892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606",
+                    "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
+                    "stateRoot" : "0xa407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0892f014ba67092e892e51a6ae23a986821badc24785eb5ac6a739119aa91b606a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0d0d5085ef06875edc9ceb951b55908f35dff973070663595d6377941c2a10de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a05700a487b3b4cf3bff8313af41aadb53d3eefdccd53883c2dc29fc598b1db189886ca7a5b4d97a752ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a042c352b324e8f7578f4b83097183490828f83fe9f0209a0354b7d82af180eda988d703af5f07fb5b8df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc32ec5652d4709591dc1621b0a174333664182504b4dde7c6f4ab349d443af7b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x26766a827285a79bd3a25a8e78deecc77a2f1978d3eedda2b14a568e37c528c4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a60205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x40"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a03c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff5fba",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a60205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem33b_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem33b_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xa03c",
+                    "hash" : "0xbdaff630d0dcdbfa07643a2e198ce2df68fd88295d1dfd02707043717846af78",
+                    "mixHash" : "0x8d5f76cea5d358d640f212fd65827d9473b9df07459e460283ee63160e889348",
+                    "nonce" : "0x5dc9784acd5d44ec",
+                    "number" : "0x01",
+                    "parentHash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
+                    "receiptTrie" : "0x6eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edf",
+                    "stateRoot" : "0xa407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0f8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a407ab87286b521ba49de39c4009a8123d9ef757ac3f63bbff013112dbdc3ed8a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06eed8b2a41a350c9d8eea3bf12c61f5918e9f4969fe5ec6b2935d8df93193edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082a03c8203e880a08d5f76cea5d358d640f212fd65827d9473b9df07459e460283ee63160e889348885dc9784acd5d44ecf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xf8fbaa29df28f9ad3cb6376f0cc9afe9f61ac927c2c39ff176be2167339fa491",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa9376d9ced09fdfc3d484cb87ac589c597c39cae63c6985b0a6ca2ab9803de0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbdaff630d0dcdbfa07643a2e198ce2df68fd88295d1dfd02707043717846af78",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a60205359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+1_d0g0v0.json
index 08fcb0f02..b2d3a9de5 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb+1_d0g0v0_EIP150" : {
+    "mem64kb+1_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/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x8327253bee2043c85cf4e348f322ef274ad864389ccaf48f895c6b40db27d621",
-                    "mixHash" : "0xff181fa785049bf0d5ba73e1691458316946c74379cbe0601884f99d7856b546",
-                    "nonce" : "0x24b5408287d8a397",
+                    "hash" : "0xc9b27be73510453cba06fbe05665581f1546b907ff6b7d8e241c5774167b8a05",
+                    "mixHash" : "0x0e5d42ed59052e5f53d8c25d028bdc2d4380bc1a4b212dfb5b2ca8dc5beef1f0",
+                    "nonce" : "0xef5b76dc7529a7d0",
                     "number" : "0x01",
                     "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
-                    "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
-                    "stateRoot" : "0x97e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6be",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0xf5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0ff181fa785049bf0d5ba73e1691458316946c74379cbe0601884f99d7856b5468824b5408287d8a397f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a00e5d42ed59052e5f53d8c25d028bdc2d4380bc1a4b212dfb5b2ca8dc5beef1f088ef5b76dc7529a7d0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8327253bee2043c85cf4e348f322ef274ad864389ccaf48f895c6b40db27d621",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc9b27be73510453cba06fbe05665581f1546b907ff6b7d8e241c5774167b8a05",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e15261f9e15160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb+1_d0g0v0_EIP158" : {
+    "mem64kb+1_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/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0xa46edbc12ad22f1cc723b77983f98a7f8da6261342ec03a767dded6a461ff3ef",
-                    "mixHash" : "0x8ab743dae1633ddfe0cd3d2149a7b72cd1e4cbf5e0d5e1376bc888bc41dd7a0a",
-                    "nonce" : "0x176af1d01b48a50e",
+                    "hash" : "0xdbd5b2719e84e9cc7f122b16620eeef8b0e94e442ec1a490a1c6e87102a8f73b",
+                    "mixHash" : "0x8a5a2e8b972d4205342557cd923c1d36eec9d73a8bfcb5afb0603bd665293f82",
+                    "nonce" : "0xe00c611d786b863a",
                     "number" : "0x01",
                     "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
-                    "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
-                    "stateRoot" : "0x97e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6be",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0xf5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a08ab743dae1633ddfe0cd3d2149a7b72cd1e4cbf5e0d5e1376bc888bc41dd7a0a88176af1d01b48a50ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a08a5a2e8b972d4205342557cd923c1d36eec9d73a8bfcb5afb0603bd665293f8288e00c611d786b863af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa46edbc12ad22f1cc723b77983f98a7f8da6261342ec03a767dded6a461ff3ef",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdbd5b2719e84e9cc7f122b16620eeef8b0e94e442ec1a490a1c6e87102a8f73b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e15261f9e15160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb+1_d0g0v0_Frontier" : {
+    "mem64kb+1_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/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0xfe21730677bdffbfe957df14c1a9175938d861662223b9beaf8bf4ec63a65ca2",
-                    "mixHash" : "0x523ba4546e218a824de04bd36c21d04c95a9dc0e3c6191aa42d790ef6191df13",
-                    "nonce" : "0x09608fe72d3227f2",
+                    "hash" : "0x5cc88fbac59b087e72884f7073fa52bc562fc962cf598f91b235f9a92b8940ed",
+                    "mixHash" : "0xa3c157e2c3601e2292eee853a54ba4af17bd42925e59ba4aceb3499739aac235",
+                    "nonce" : "0x65ba79002b5b73bb",
                     "number" : "0x01",
                     "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
                     "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0523ba4546e218a824de04bd36c21d04c95a9dc0e3c6191aa42d790ef6191df138809608fe72d3227f2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0a3c157e2c3601e2292eee853a54ba4af17bd42925e59ba4aceb3499739aac2358865ba79002b5b73bbf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe21730677bdffbfe957df14c1a9175938d861662223b9beaf8bf4ec63a65ca2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5cc88fbac59b087e72884f7073fa52bc562fc962cf598f91b235f9a92b8940ed",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb+1_d0g0v0_Homestead" : {
+    "mem64kb+1_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/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x90af383c1e1fa5b24f31edf8701370eb3895ae0d63cd5a9423a46c2915b50365",
-                    "mixHash" : "0x80bcda862050a1f1772d480a1d00950d87a90867ad1a0c339f99d6d2def2b01a",
-                    "nonce" : "0x43c951dc47c39327",
+                    "hash" : "0x9ad8a9c7fde07bc7188380113918e1d2ad80db33ad9e56c7c45426490820183f",
+                    "mixHash" : "0x72aecf4f40f04595eb96b1a8789501b9e9644d790d47c1ac46b8bc6f00478010",
+                    "nonce" : "0xef82500413cf5e16",
                     "number" : "0x01",
                     "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
                     "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a080bcda862050a1f1772d480a1d00950d87a90867ad1a0c339f99d6d2def2b01a8843c951dc47c39327f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a072aecf4f40f04595eb96b1a8789501b9e9644d790d47c1ac46b8bc6f0047801088ef82500413cf5e16f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90af383c1e1fa5b24f31edf8701370eb3895ae0d63cd5a9423a46c2915b50365",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9ad8a9c7fde07bc7188380113918e1d2ad80db33ad9e56c7c45426490820183f",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb+1_d0g0v0_Metropolis" : {
+    "mem64kb+1_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/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0xcb8de57f30fcb1eb9d874df38015b0ef4cd48e1206ea9e4c6248d6d2a48677a7",
-                    "mixHash" : "0x5d42b4dbbc07937f329868253f36ef69ea486e27d42fd96c3badeebffb3efe82",
-                    "nonce" : "0x521bd7b833932d8b",
+                    "hash" : "0xc767b08ec8c58b42285479605f4a6bbaeb8bf7d8f15a7890c0fc1e033966e627",
+                    "mixHash" : "0xf44374044df68ddc5a74b2bd95c702cc05686e6f36cf7219fabcbf38ebfa3d77",
+                    "nonce" : "0x616e1dc0b885823f",
                     "number" : "0x01",
                     "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
-                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
-                    "stateRoot" : "0xf5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605",
+                    "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
+                    "stateRoot" : "0x97e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b9140aea6c3410d1e2e87accc89a9138e674527b2dbc5c545863fcaf753605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a05d42b4dbbc07937f329868253f36ef69ea486e27d42fd96c3badeebffb3efe8288521bd7b833932d8bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0f44374044df68ddc5a74b2bd95c702cc05686e6f36cf7219fabcbf38ebfa3d7788616e1dc0b885823ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb8de57f30fcb1eb9d874df38015b0ef4cd48e1206ea9e4c6248d6d2a48677a7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc767b08ec8c58b42285479605f4a6bbaeb8bf7d8f15a7890c0fc1e033966e627",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9e15261f9e15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5245e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedb98",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9e15261f9e15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb+1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb+1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x01245e",
+                    "hash" : "0xcba17dcc3f7601b629a1682b8570e3b3ee25a98e113efa683d7e6f15052da723",
+                    "mixHash" : "0x228a9e37c43c989895282df5e67d96a82fb0f20889356fc3ea632c7c592c53f5",
+                    "nonce" : "0x170dc66449ad1c7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
+                    "receiptTrie" : "0x6abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27",
+                    "stateRoot" : "0x97e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6be",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa060ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097e32f57500b9cc7d4ac30e3ea929c8bf1c9f53b380b785b3c541ec985dcc6bea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa06abe6dc31b2320f9936ba3faf99faf767d0bd331f6fbf2ce4dff832fa7817d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0228a9e37c43c989895282df5e67d96a82fb0f20889356fc3ea632c7c592c53f588170dc66449ad1c7bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x60ce21b454efd648065fde9461e500036ef944bd8148ac35dcbbe719f76a772e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0912346d512012405bb5ddae8f424baf4bd82ccd540c5bd07fc1def5ed6b9e0d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcba17dcc3f7601b629a1682b8570e3b3ee25a98e113efa683d7e6f15052da723",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e15261f9e15160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+31_d0g0v0.json
index 7b0ec3ea2..3fafb5eaa 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb+31_d0g0v0_EIP150" : {
+    "mem64kb+31_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/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x7c2a116537dcf208a84ba2f442984d64141d750d5321908727d404b5e527b411",
-                    "mixHash" : "0x10bf47fcbd12bc6a94deaf43d372dfb53ccdf69b4affc15122d71028dbe082bb",
-                    "nonce" : "0x3ad11ed335d0f308",
+                    "hash" : "0x2c5f9cfc39b5c05f0cd213b52f37eb544564e8e04fb0b2db235167c705d3634b",
+                    "mixHash" : "0xd45c761c964efa08cd3956a96fe1844f194b127a8ac1747861096108a9162d1a",
+                    "nonce" : "0x7d68375237335b3f",
                     "number" : "0x01",
                     "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
-                    "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
-                    "stateRoot" : "0x58ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0x28e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a010bf47fcbd12bc6a94deaf43d372dfb53ccdf69b4affc15122d71028dbe082bb883ad11ed335d0f308f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0d45c761c964efa08cd3956a96fe1844f194b127a8ac1747861096108a9162d1a887d68375237335b3ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c2a116537dcf208a84ba2f442984d64141d750d5321908727d404b5e527b411",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2c5f9cfc39b5c05f0cd213b52f37eb544564e8e04fb0b2db235167c705d3634b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5261f9ff5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb+31_d0g0v0_EIP158" : {
+    "mem64kb+31_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/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x46a031286e8f034bd12d787886a6cdb43fb2ab25af7b9c5ff7ea0ea0a8d82a7b",
-                    "mixHash" : "0x9f3b2140949f3b51b3fe6fb466dd45b647ae0ffe174728efeee2cb813693b530",
-                    "nonce" : "0x30ae6bf9f97683c5",
+                    "hash" : "0x48f1cf7868ef305b99ad52829efffb9a678c68b469bea26c5f10afc5e1629600",
+                    "mixHash" : "0xf0805f451772e3e8dd4125ee6820943650d21a63972b389ea565eebead6c792d",
+                    "nonce" : "0x75fbdf0e2a4ba5a1",
                     "number" : "0x01",
                     "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
-                    "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
-                    "stateRoot" : "0x58ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0x28e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a09f3b2140949f3b51b3fe6fb466dd45b647ae0ffe174728efeee2cb813693b5308830ae6bf9f97683c5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0f0805f451772e3e8dd4125ee6820943650d21a63972b389ea565eebead6c792d8875fbdf0e2a4ba5a1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46a031286e8f034bd12d787886a6cdb43fb2ab25af7b9c5ff7ea0ea0a8d82a7b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x48f1cf7868ef305b99ad52829efffb9a678c68b469bea26c5f10afc5e1629600",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5261f9ff5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb+31_d0g0v0_Frontier" : {
+    "mem64kb+31_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/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0xe7e034716409eff90ec4f7cd1aab7a220a1f3f2057b9646b79f440ab772856c5",
-                    "mixHash" : "0x7274d02c205f92e7b9154f371f0ca4a3df9c102e89912c8ab1abdc5874c8d54d",
-                    "nonce" : "0xb713c4e2b566d206",
+                    "hash" : "0x3a23be4d1c1616f8015740ae09d2a1f96c507c6aa383bc1ce1ba4e4720501e44",
+                    "mixHash" : "0xe68831bc337fd9381ac50fedf5cd4a18a2bf824e33c5732e16de9226b0987aca",
+                    "nonce" : "0x4235d30109422ba8",
                     "number" : "0x01",
                     "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
                     "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a07274d02c205f92e7b9154f371f0ca4a3df9c102e89912c8ab1abdc5874c8d54d88b713c4e2b566d206f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0e68831bc337fd9381ac50fedf5cd4a18a2bf824e33c5732e16de9226b0987aca884235d30109422ba8f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7e034716409eff90ec4f7cd1aab7a220a1f3f2057b9646b79f440ab772856c5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3a23be4d1c1616f8015740ae09d2a1f96c507c6aa383bc1ce1ba4e4720501e44",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb+31_d0g0v0_Homestead" : {
+    "mem64kb+31_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/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x30e03d450132dd51c88b6c8a2c631242df567c1b4992a578fdec0c2d11a9ad1d",
-                    "mixHash" : "0xade05c58524b220fb38a14493abe3507cf04e8c1772804d7848fa644c668927a",
-                    "nonce" : "0x4f6c3ac98a303cd4",
+                    "hash" : "0xe28c336121dc781de1f0afe9962e4bbf48807c0fe239d1fd5726b9ec9898bb5d",
+                    "mixHash" : "0xbe6edddbbf09275c6e714420f8c07d7179b377b795f112a14504ab59055fa60e",
+                    "nonce" : "0x3defa0b572af794e",
                     "number" : "0x01",
                     "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
                     "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0ade05c58524b220fb38a14493abe3507cf04e8c1772804d7848fa644c668927a884f6c3ac98a303cd4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0be6edddbbf09275c6e714420f8c07d7179b377b795f112a14504ab59055fa60e883defa0b572af794ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30e03d450132dd51c88b6c8a2c631242df567c1b4992a578fdec0c2d11a9ad1d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe28c336121dc781de1f0afe9962e4bbf48807c0fe239d1fd5726b9ec9898bb5d",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb+31_d0g0v0_Metropolis" : {
+    "mem64kb+31_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/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x4fe9964d7fa14f52be9bf42cef719bce67031e6318a0528bda417dd310acd1b1",
-                    "mixHash" : "0x7f2f069cd2332e6c26613b65f15676c037674e3b40630b74c44db325ab152afd",
-                    "nonce" : "0x10223cd29d07d1d2",
+                    "hash" : "0x7876f31cd0cf578ac15360b7e0cc665950a64600d870c8172584402c6f18fe75",
+                    "mixHash" : "0xa592b727c8d3341145d7e741860b203940a06aa3ec09dd812cab960382877571",
+                    "nonce" : "0x97df7b8ab4134198",
                     "number" : "0x01",
                     "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
-                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
-                    "stateRoot" : "0x28e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9a",
+                    "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
+                    "stateRoot" : "0x58ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028e5440ac71500a6c602a332e123bfb7f5c4b65cc2c1794b9a473d8f07315d9aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a07f2f069cd2332e6c26613b65f15676c037674e3b40630b74c44db325ab152afd8810223cd29d07d1d2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0a592b727c8d3341145d7e741860b203940a06aa3ec09dd812cab9603828775718897df7b8ab4134198f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fe9964d7fa14f52be9bf42cef719bce67031e6318a0528bda417dd310acd1b1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7876f31cd0cf578ac15360b7e0cc665950a64600d870c8172584402c6f18fe75",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9ff5261f9ff5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5245e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedb98",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9ff5261f9ff5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb+31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb+31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x01245e",
+                    "hash" : "0xfa31051594eb2f8b0b0a6edf4b51903fa0ce4d80da1545a96f78d63d62b729fe",
+                    "mixHash" : "0xaba578ff64397c8626cd5c1cc49c10e6ed4eee97434a079dc6cd8e84131fa03f",
+                    "nonce" : "0x5124781ebbcc742c",
+                    "number" : "0x01",
+                    "parentHash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
+                    "receiptTrie" : "0xa90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561",
+                    "stateRoot" : "0x58ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0f76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa058ffa43812464cf1f31dc5df4ed6f4326a0f993255f48153a8bfc9bd35f34ed2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0a90e93ade596999453cceae7c2e22af456720e0e1f58b7588dd4d965a6459561b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0aba578ff64397c8626cd5c1cc49c10e6ed4eee97434a079dc6cd8e84131fa03f885124781ebbcc742cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xf76dda9b33074cbf12879a64a481822f29a2339002704008f7af3dd186cc2234",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938eb430c56038c68a6683d8fbfde28c07588a5f8bb77d2fa61df1837cc9a6f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa31051594eb2f8b0b0a6edf4b51903fa0ce4d80da1545a96f78d63d62b729fe",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5261f9ff5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+32_d0g0v0.json
index a6a95a7fc..41c36abfe 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb+32_d0g0v0_EIP150" : {
+    "mem64kb+32_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/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x6861ec890c1cf2e898cd925ebc26d30703624c06b5af92070ef1bada89699f21",
-                    "mixHash" : "0xcf96ab3f231312fc1098716cb05168d63624efec149e8f6abf49518cf3a2c4dd",
-                    "nonce" : "0x959535d813b04e98",
+                    "hash" : "0x8a08fd7180228200ecbed7c6af89020041920594c5ffd83c144aab5fc152a4b0",
+                    "mixHash" : "0x767da485299051ebd1c8d92e824cbf2a95825192560a165e402633eb39050889",
+                    "nonce" : "0xb63c1c0cd4f49ac4",
                     "number" : "0x01",
                     "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
-                    "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
-                    "stateRoot" : "0x38af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42a",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0xa6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0cf96ab3f231312fc1098716cb05168d63624efec149e8f6abf49518cf3a2c4dd88959535d813b04e98f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45eca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0767da485299051ebd1c8d92e824cbf2a95825192560a165e402633eb3905088988b63c1c0cd4f49ac4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6861ec890c1cf2e898cd925ebc26d30703624c06b5af92070ef1bada89699f21",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8a08fd7180228200ecbed7c6af89020041920594c5ffd83c144aab5fc152a4b0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005261fa005160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb+32_d0g0v0_EIP158" : {
+    "mem64kb+32_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/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x2e96b376f131e2f8599f59144332931df40a690e65c308e3c8c02fa85e621294",
-                    "mixHash" : "0xd601d4ff96551ad6ba9c0bc27f7ecfcb6ad84e7518f88a949233f6be40ca5142",
-                    "nonce" : "0x1a217b6267b9d4e5",
+                    "hash" : "0x2b544148b6bffe4dd422b369ce94349f6a50749d10e96f68d590e1643232fb02",
+                    "mixHash" : "0x8bed0e43d19ab6822b6c8800e98866782dcc0d890b765b36e49d9c85e8fad433",
+                    "nonce" : "0x874c8bb089acf5c4",
                     "number" : "0x01",
                     "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
-                    "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
-                    "stateRoot" : "0x38af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42a",
+                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
+                    "stateRoot" : "0xa6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0d601d4ff96551ad6ba9c0bc27f7ecfcb6ad84e7518f88a949233f6be40ca5142881a217b6267b9d4e5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45eca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a08bed0e43d19ab6822b6c8800e98866782dcc0d890b765b36e49d9c85e8fad43388874c8bb089acf5c4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e96b376f131e2f8599f59144332931df40a690e65c308e3c8c02fa85e621294",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2b544148b6bffe4dd422b369ce94349f6a50749d10e96f68d590e1643232fb02",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005261fa005160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb+32_d0g0v0_Frontier" : {
+    "mem64kb+32_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/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x58f64dbbb2abdab798ff48beb2b8ca0967f4a0654a914296eb3df482bd0e4b38",
-                    "mixHash" : "0x9b07252274ecec4c36352b4e9812a29e4db2a97c970103ecc04e7bd1207b8338",
-                    "nonce" : "0x2b3983e80c7f91fc",
+                    "hash" : "0x82d2c98a19840f014d075f59c67f48c34a40375da510ffdd8f62236e16bed1e2",
+                    "mixHash" : "0xb12540b48df5bda2235b0f3391d059b20999e1029ea31bd7671674a3f3e405ab",
+                    "nonce" : "0x57e9f2fac365123d",
                     "number" : "0x01",
                     "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
                     "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a09b07252274ecec4c36352b4e9812a29e4db2a97c970103ecc04e7bd1207b8338882b3983e80c7f91fcf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0b12540b48df5bda2235b0f3391d059b20999e1029ea31bd7671674a3f3e405ab8857e9f2fac365123df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58f64dbbb2abdab798ff48beb2b8ca0967f4a0654a914296eb3df482bd0e4b38",
-        "network" : "Frontier",
+        "lastblockhash" : "0x82d2c98a19840f014d075f59c67f48c34a40375da510ffdd8f62236e16bed1e2",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb+32_d0g0v0_Homestead" : {
+    "mem64kb+32_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/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x4754f378f01ed1f9c022bb5a14da8a7b59a294399dbe1fc6ce31d83559560dce",
-                    "mixHash" : "0x0157a3a8b373c85dd81e4a55fb3e61f91da0dd7c588bdff9812c67665534eb62",
-                    "nonce" : "0x93a7fd8000f46401",
+                    "hash" : "0xa3bc4ec60cade4122f14219ab44684a7b4d564d29dccab8e0f9b4bb6de7bf84a",
+                    "mixHash" : "0x4ef2e4a11cf4d76e9bbaad0e73f2c047410fe34e26cd97a168c25a193a5e17c8",
+                    "nonce" : "0x709992f4675d04d5",
                     "number" : "0x01",
                     "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
                     "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a00157a3a8b373c85dd81e4a55fb3e61f91da0dd7c588bdff9812c67665534eb628893a7fd8000f46401f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a04ef2e4a11cf4d76e9bbaad0e73f2c047410fe34e26cd97a168c25a193a5e17c888709992f4675d04d5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4754f378f01ed1f9c022bb5a14da8a7b59a294399dbe1fc6ce31d83559560dce",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa3bc4ec60cade4122f14219ab44684a7b4d564d29dccab8e0f9b4bb6de7bf84a",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb+32_d0g0v0_Metropolis" : {
+    "mem64kb+32_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/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x01245e",
-                    "hash" : "0x1868d8c0a0cf5994312df73faaaa156efc6c51aaed86d6ec41da862ef4f5aa05",
-                    "mixHash" : "0x0aec983d6e0ae342fff18decf7bac5af15a6e22c717159b31301424c4603436a",
-                    "nonce" : "0x6082d987704d2607",
+                    "hash" : "0x2bd64c183676af1ac6947304a60cb44ecdec5cc5cc4fecee86b60214f3393d94",
+                    "mixHash" : "0x2506444325a2416855f91bc4e781d7d9475c614bafc6fbb49f2b1b81fcaa535e",
+                    "nonce" : "0x79990f536fcb6427",
                     "number" : "0x01",
                     "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
-                    "receiptTrie" : "0xf1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289",
-                    "stateRoot" : "0xa6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45ec",
+                    "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
+                    "stateRoot" : "0x38af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6217e0d96e57918b63b91a7ea4ca9bf1490bd084f1143ee2d28151f67ac45eca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0f1ce13f5f39cd66c9fe92e0cf3cd6edf8223ecff9b3eb0aaca2cbcef9f7aa289b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a00aec983d6e0ae342fff18decf7bac5af15a6e22c717159b31301424c4603436a886082d987704d2607f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a02506444325a2416855f91bc4e781d7d9475c614bafc6fbb49f2b1b81fcaa535e8879990f536fcb6427f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1868d8c0a0cf5994312df73faaaa156efc6c51aaed86d6ec41da862ef4f5aa05",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2bd64c183676af1ac6947304a60cb44ecdec5cc5cc4fecee86b60214f3393d94",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa005261fa005160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5245e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedb98",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa005261fa005160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb+32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb+32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x01245e",
+                    "hash" : "0xd3f2c1e97033983cd16921e49e6f7b6517d4b5a4b8079e31a6382205a7ec311c",
+                    "mixHash" : "0xe95ffeaf0abc6a8ac60a1d44c74cf3283764f0aa58bd0d1e4411d215d6792d86",
+                    "nonce" : "0x4a57c07c56039ef0",
+                    "number" : "0x01",
+                    "parentHash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
+                    "receiptTrie" : "0x9e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21b",
+                    "stateRoot" : "0x38af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0fbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038af8240a53aaceafbea0fd25363d07e9e358c975c88625c433f2c910adfa42aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa09e571046baa16f86c307e0c51f00da737d0f803d16ee73090a177a58b716c21bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301245e8203e880a0e95ffeaf0abc6a8ac60a1d44c74cf3283764f0aa58bd0d1e4411d215d6792d86884a57c07c56039ef0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xfbbe45e5cd3110f7a92f2cecff24f92a64719d84bb9b04937713b78646e4d1ea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5317d3463a6f7a1f9a2cf7beb6e2793980e575def1ac166cae44f68dc2a629fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd3f2c1e97033983cd16921e49e6f7b6517d4b5a4b8079e31a6382205a7ec311c",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005261fa005160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+33_d0g0v0.json
index cbc60f42e..0abe6d2a2 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb+33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb+33_d0g0v0_EIP150" : {
+    "mem64kb+33_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/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012469",
-                    "hash" : "0x3050ae7663da8f54ab90d6dcc12d848a54e9dc4ffed1e3e1e91d2751af17122a",
-                    "mixHash" : "0x0840121258c278756575b4a6a3909399201955f7c7a5c6c9b5658bf2d0b3f569",
-                    "nonce" : "0x0c88483084204e58",
+                    "hash" : "0x6b15e4073f6ffcd5d681f98bd323d30b30bf169e781cfcfaf808c84f918c0d45",
+                    "mixHash" : "0x183b3b62ebd9b5363549f39820e2d84a08d6ddaf9fd12a4c18a62540d808399e",
+                    "nonce" : "0x8da974e68ca59380",
                     "number" : "0x01",
                     "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
-                    "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
-                    "stateRoot" : "0x8ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2",
+                    "receiptTrie" : "0x72635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6",
+                    "stateRoot" : "0x0b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a00840121258c278756575b4a6a3909399201955f7c7a5c6c9b5658bf2d0b3f569880c88483084204e58f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa072635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0183b3b62ebd9b5363549f39820e2d84a08d6ddaf9fd12a4c18a62540d808399e888da974e68ca59380f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3050ae7663da8f54ab90d6dcc12d848a54e9dc4ffed1e3e1e91d2751af17122a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6b15e4073f6ffcd5d681f98bd323d30b30bf169e781cfcfaf808c84f918c0d45",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa015261fa015160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb+33_d0g0v0_EIP158" : {
+    "mem64kb+33_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/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012469",
-                    "hash" : "0xe7f1feb411b8646d3658938974fc8158e56811de92c9f94372317b54c0b4acc1",
-                    "mixHash" : "0xbdbfb353ff7a081a8ac6395a1e1aaf96deb11f7d6451fd7267dff1c7303feea9",
-                    "nonce" : "0x4f6c08d38921d3cc",
+                    "hash" : "0x0c1873e14832afe3deab30735468ffd232b4d6d7bfeb9a564cd3eab11b096a20",
+                    "mixHash" : "0x090d143ebcd175fcccfa721dd8c320115cfc5401c9e293546c8ee85860f34b9a",
+                    "nonce" : "0x7f59bbd2ee359e33",
                     "number" : "0x01",
                     "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
-                    "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
-                    "stateRoot" : "0x8ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2",
+                    "receiptTrie" : "0x72635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6",
+                    "stateRoot" : "0x0b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0bdbfb353ff7a081a8ac6395a1e1aaf96deb11f7d6451fd7267dff1c7303feea9884f6c08d38921d3ccf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa072635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0090d143ebcd175fcccfa721dd8c320115cfc5401c9e293546c8ee85860f34b9a887f59bbd2ee359e33f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7f1feb411b8646d3658938974fc8158e56811de92c9f94372317b54c0b4acc1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0c1873e14832afe3deab30735468ffd232b4d6d7bfeb9a564cd3eab11b096a20",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa015261fa015160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb+33_d0g0v0_Frontier" : {
+    "mem64kb+33_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/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012469",
-                    "hash" : "0x35c4deb6deef83158ddbc013c9b6120e357c90a1d1abd588df616a0b523f58ad",
-                    "mixHash" : "0x357cf0b6658024a89c828884a090ebfdeacf8f72eb18381037fd350a8a23e2d5",
-                    "nonce" : "0x81667b126c77cb6a",
+                    "hash" : "0xbcc7226111357451fbf4af8abdac6a44bd30780110dbbcd608b31a2f8f57b08c",
+                    "mixHash" : "0x373866f51186d6e100c2fc556605e0741c579326b998c870c4c31dcebffc35ff",
+                    "nonce" : "0xa8ee4322788994e1",
                     "number" : "0x01",
                     "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
                     "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0357cf0b6658024a89c828884a090ebfdeacf8f72eb18381037fd350a8a23e2d58881667b126c77cb6af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0373866f51186d6e100c2fc556605e0741c579326b998c870c4c31dcebffc35ff88a8ee4322788994e1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35c4deb6deef83158ddbc013c9b6120e357c90a1d1abd588df616a0b523f58ad",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbcc7226111357451fbf4af8abdac6a44bd30780110dbbcd608b31a2f8f57b08c",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb+33_d0g0v0_Homestead" : {
+    "mem64kb+33_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/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012469",
-                    "hash" : "0x3343370cd91508e403ab210065d1d7e8ffa8e6771f44761fe04b99298b11c44a",
-                    "mixHash" : "0x0395864c6cb19770987ba44fbcb16c17742498ad65214985867aad9ca328145a",
-                    "nonce" : "0x4a6e7e5120807fcb",
+                    "hash" : "0x34b0531ff1aee5b94bd6e936c25fbeab0dfe2eef2966155ef20a6b08883e7f65",
+                    "mixHash" : "0xadf8ac8cd37606204cf7ddba480324084fe65875a865692aaa7df949387c0fbe",
+                    "nonce" : "0x106c5b984ecdce16",
                     "number" : "0x01",
                     "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
                     "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a00395864c6cb19770987ba44fbcb16c17742498ad65214985867aad9ca328145a884a6e7e5120807fcbf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a0adf8ac8cd37606204cf7ddba480324084fe65875a865692aaa7df949387c0fbe88106c5b984ecdce16f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3343370cd91508e403ab210065d1d7e8ffa8e6771f44761fe04b99298b11c44a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x34b0531ff1aee5b94bd6e936c25fbeab0dfe2eef2966155ef20a6b08883e7f65",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb+33_d0g0v0_Metropolis" : {
+    "mem64kb+33_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/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012469",
-                    "hash" : "0x33fcd1fb529d664a093bff4a905638398172e9cebb3cd6a3d7d01d49689bb05e",
-                    "mixHash" : "0x97233241fca2278bf84590f5d7fabc8e6db05e32a46d3c74b4a0daacb5cd164e",
-                    "nonce" : "0xdbf897483fedf513",
+                    "hash" : "0x7d60ff7d697e742d094f10312565a5b167cfbd428d8e78d73d90c40b93f36c4e",
+                    "mixHash" : "0x8d324fe640ea36515ce72042ba5b90d7af33e1527e891850b98d80ff1466352e",
+                    "nonce" : "0x44ca7d6ff6dca042",
                     "number" : "0x01",
                     "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
-                    "receiptTrie" : "0x72635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6",
-                    "stateRoot" : "0x0b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61",
+                    "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
+                    "stateRoot" : "0x8ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b386e68fb9d8121317e6775fc577bf662fe983923340a8615b67402c13fad61a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa072635642c108d984c57e8d1210abda18a426482bbcd635b716fe46fa2cc93fc6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a097233241fca2278bf84590f5d7fabc8e6db05e32a46d3c74b4a0daacb5cd164e88dbf897483fedf513f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a08d324fe640ea36515ce72042ba5b90d7af33e1527e891850b98d80ff1466352e8844ca7d6ff6dca042f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33fcd1fb529d664a093bff4a905638398172e9cebb3cd6a3d7d01d49689bb05e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7d60ff7d697e742d094f10312565a5b167cfbd428d8e78d73d90c40b93f36c4e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa015261fa015160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa40",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52469",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedb8d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa015261fa015160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb+33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb+33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012469",
+                    "hash" : "0x4b733c87c3929f17e6b5d7260c633e1eb7cdac21332315d75c0d719fde5447cd",
+                    "mixHash" : "0x6a9f56c15c5844d74e38c62129a15ce7d72f532b66995a5eda20053ab65e8627",
+                    "nonce" : "0xd627fa4f529f11ce",
+                    "number" : "0x01",
+                    "parentHash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
+                    "receiptTrie" : "0xc9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103",
+                    "stateRoot" : "0x8ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0b72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef0841b8e42259bb6bf19841c17427a41f53b27a1c049a7f27a7c60888a00c2a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0c9eadf1ba098d09754a6d28d33d654074f28accbbe85981e9724eb6c734cd103b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124698203e880a06a9f56c15c5844d74e38c62129a15ce7d72f532b66995a5eda20053ab65e862788d627fa4f529f11cef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xb72f941dda4a20e15aefb3c8966a429d7a1c0a54d058e190d38bff66b1cc4237",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f4061c63fd2689cb957dcefe3c5a63564e2182f9237d97cc9b6eb76a34b961aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b733c87c3929f17e6b5d7260c633e1eb7cdac21332315d75c0d719fde5447cd",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa015261fa015160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-1_d0g0v0.json
index e6d6086f8..67198f33a 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb-1_d0g0v0_EIP150" : {
+    "mem64kb-1_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/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0xf793aa502e613173af9c52c92e0d09aa320566f4e2f5d90fa75db0f72c3c07d1",
-                    "mixHash" : "0x0e09e93f7bd371936d9843f5e9f34f251d0ff80511bacbe1dc54ad95a7b6cd8d",
-                    "nonce" : "0x5ff4b1f1cbb793de",
+                    "hash" : "0x045221e596446ed201576e00d816648ba6b0ff23d9114cb769a9fd0c2cbeab3f",
+                    "mixHash" : "0x5ba76b27f45db0c14f956d934d48b2824fedbe745f78abcc4acbf7c01ec6565d",
+                    "nonce" : "0x0c71f8114f0e1875",
                     "number" : "0x01",
                     "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
-                    "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
-                    "stateRoot" : "0xc259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcd",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0xd126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a00e09e93f7bd371936d9843f5e9f34f251d0ff80511bacbe1dc54ad95a7b6cd8d885ff4b1f1cbb793def863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a05ba76b27f45db0c14f956d934d48b2824fedbe745f78abcc4acbf7c01ec6565d880c71f8114f0e1875f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf793aa502e613173af9c52c92e0d09aa320566f4e2f5d90fa75db0f72c3c07d1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x045221e596446ed201576e00d816648ba6b0ff23d9114cb769a9fd0c2cbeab3f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5261f9df5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb-1_d0g0v0_EIP158" : {
+    "mem64kb-1_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/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0xf224f6685b39de8cecc881063d3fe561042c7b385f854e7228de85cbf62e43d5",
-                    "mixHash" : "0x0198dcc7856c94589ffcb4077cf39bf712f03fc3e4a1f340a8452d3a87b318ea",
-                    "nonce" : "0xdbbbf33eef2aafa1",
+                    "hash" : "0xad2772b4833968e720108b93a210862bcc5e79fbb970a2ceeff6a474ad3e467e",
+                    "mixHash" : "0x131e350f46d85e824da8bc2096a42bb47404327ad6106b35d17cb2d673b81fd1",
+                    "nonce" : "0xfe77785fdb74316e",
                     "number" : "0x01",
                     "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
-                    "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
-                    "stateRoot" : "0xc259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcd",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0xd126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a00198dcc7856c94589ffcb4077cf39bf712f03fc3e4a1f340a8452d3a87b318ea88dbbbf33eef2aafa1f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0131e350f46d85e824da8bc2096a42bb47404327ad6106b35d17cb2d673b81fd188fe77785fdb74316ef863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf224f6685b39de8cecc881063d3fe561042c7b385f854e7228de85cbf62e43d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xad2772b4833968e720108b93a210862bcc5e79fbb970a2ceeff6a474ad3e467e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5261f9df5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb-1_d0g0v0_Frontier" : {
+    "mem64kb-1_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/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x399095e65bde60aa665139fc2ad696b36e86f1687af6624837814453a69139a1",
-                    "mixHash" : "0x54aee0deb645e79a245ffadfc87a79c7a561155ac2bfb97b817dadfcfb5eb59a",
-                    "nonce" : "0xde8ce5606b02535f",
+                    "hash" : "0x68a449026c85d6b694c824da60703a7087bd92006a1545a0dfb61ce11168b6d1",
+                    "mixHash" : "0xf2e9f47ff68dfa59b80d457c8dbdebf0dfd4269741188ba0588bc12efddff605",
+                    "nonce" : "0x278d79a4e57d021c",
                     "number" : "0x01",
                     "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
                     "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a054aee0deb645e79a245ffadfc87a79c7a561155ac2bfb97b817dadfcfb5eb59a88de8ce5606b02535ff863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0f2e9f47ff68dfa59b80d457c8dbdebf0dfd4269741188ba0588bc12efddff60588278d79a4e57d021cf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x399095e65bde60aa665139fc2ad696b36e86f1687af6624837814453a69139a1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x68a449026c85d6b694c824da60703a7087bd92006a1545a0dfb61ce11168b6d1",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb-1_d0g0v0_Homestead" : {
+    "mem64kb-1_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/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x99042fbe780674aba87ff6f73e86add1e8e8071a233c9d69c1717747452cb542",
-                    "mixHash" : "0xb15bb98e95d227c25c23327f0981cbccd9057f37fceee15b12a3a5eecc3ce9bb",
-                    "nonce" : "0x57ee8da73dd4e5db",
+                    "hash" : "0xf461b0dfb945b9f7f05e2c2e682149d2e1d4da9738d3867f46561fe9c6523f31",
+                    "mixHash" : "0x2b925d3e06516197a14bb1f57ceb4b54ec5d99bb8f06de4b9effb37f3dd9c8fa",
+                    "nonce" : "0x6b275559d68ae354",
                     "number" : "0x01",
                     "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
                     "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0b15bb98e95d227c25c23327f0981cbccd9057f37fceee15b12a3a5eecc3ce9bb8857ee8da73dd4e5dbf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a02b925d3e06516197a14bb1f57ceb4b54ec5d99bb8f06de4b9effb37f3dd9c8fa886b275559d68ae354f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99042fbe780674aba87ff6f73e86add1e8e8071a233c9d69c1717747452cb542",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf461b0dfb945b9f7f05e2c2e682149d2e1d4da9738d3867f46561fe9c6523f31",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb-1_d0g0v0_Metropolis" : {
+    "mem64kb-1_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/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x5442893d5626e9aa58f72c81a7538cb6372aaa41a9d4daed1d8455d29aa40167",
-                    "mixHash" : "0x171b6066bf4e1cc1975a6e0109f351d58b83eb2a2514a5e14dccf158fdfdc000",
-                    "nonce" : "0x5bb6b19589959e68",
+                    "hash" : "0xc7e67da2d132fe00e2b89f904d68fac2588678efec704c4f47c4c4a9b6175fbb",
+                    "mixHash" : "0xf070c67371d56921e84dd9995c990ea15c9e928dbae0f4babf352845fd0e6320",
+                    "nonce" : "0x5245d94afec061a7",
                     "number" : "0x01",
                     "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
-                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
-                    "stateRoot" : "0xd126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57",
+                    "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
+                    "stateRoot" : "0xc259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d126afd5a461f5d13a8141f620ff903f80a727a33aa3c08ec33ea2cbca636e57a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0171b6066bf4e1cc1975a6e0109f351d58b83eb2a2514a5e14dccf158fdfdc000885bb6b19589959e68f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0f070c67371d56921e84dd9995c990ea15c9e928dbae0f4babf352845fd0e6320885245d94afec061a7f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5442893d5626e9aa58f72c81a7538cb6372aaa41a9d4daed1d8455d29aa40167",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc7e67da2d132fe00e2b89f904d68fac2588678efec704c4f47c4c4a9b6175fbb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9df5261f9df5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52453",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedba3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9df5261f9df5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb-1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb-1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012453",
+                    "hash" : "0x2ec63dbb59c5f6681703c5cd7f751dc465ec138a74bdbaa3738ebcde1b3bb63c",
+                    "mixHash" : "0x6da2ed97829b92ca4acbfaf1b0e05b6a1abffbf5e7280bbbcc78f4ea774f2aff",
+                    "nonce" : "0x267733ce827b65a6",
+                    "number" : "0x01",
+                    "parentHash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
+                    "receiptTrie" : "0xfd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545e",
+                    "stateRoot" : "0xc259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa09f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c259299cbb230d2fae614c2e0314898e5e35a68ac7efc49fb5d30284ce442fcda081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0fd15623205a074ec87bf2d344d41a8d3962635d7974abdad01089614ba0a545eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a06da2ed97829b92ca4acbfaf1b0e05b6a1abffbf5e7280bbbcc78f4ea774f2aff88267733ce827b65a6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x500018d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699",
+                        "s" : "0x51e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bff",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x9f7687c8325bd820914789f8eca2e6ebb9a1769cda1e49359d330459020d257b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0786a36863271963422488c2b98bbd16164736ef67f7e781975c0c55d6238abb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ec63dbb59c5f6681703c5cd7f751dc465ec138a74bdbaa3738ebcde1b3bb63c",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5261f9df5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-31_d0g0v0.json
index 8f8a5432e..00cda3626 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb-31_d0g0v0_EIP150" : {
+    "mem64kb-31_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/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0xef8cdd7efbec0efed82670335691fd225d2f95894538a337cf6658abaac3066e",
-                    "mixHash" : "0xe3113bbf94f2c43da4f4c063c7df1b42befa19515012a687a30b80eb571015a4",
-                    "nonce" : "0xb20d0ab43ed44a5f",
+                    "hash" : "0x61dea8b3925f922f9147873b0edf91224ced9d2154416d8f25327d9eb90bf874",
+                    "mixHash" : "0x3401c3ff09d6aabd0d36bc30e6cf715a29ab40b0466ccef5459e1b8872343169",
+                    "nonce" : "0xd66266366073189e",
                     "number" : "0x01",
                     "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
-                    "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
-                    "stateRoot" : "0xd00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0xca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0e3113bbf94f2c43da4f4c063c7df1b42befa19515012a687a30b80eb571015a488b20d0ab43ed44a5ff863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a03401c3ff09d6aabd0d36bc30e6cf715a29ab40b0466ccef5459e1b887234316988d66266366073189ef863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef8cdd7efbec0efed82670335691fd225d2f95894538a337cf6658abaac3066e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x61dea8b3925f922f9147873b0edf91224ced9d2154416d8f25327d9eb90bf874",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c15261f9c15160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb-31_d0g0v0_EIP158" : {
+    "mem64kb-31_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/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0xca9b8f23bc1d375a5e8b8a1cb6183a839013dfe89c797f91603aac815c960cdc",
-                    "mixHash" : "0xcd65cd05f406ee436bb8911933f3e2dbadb361f81339fb54ed637d1e66c33b8b",
-                    "nonce" : "0x2891e3dab3895743",
+                    "hash" : "0x379395b7c0313954eb3ad5f1bdc2f95b76adc0141f4aa0cf3011d38028c96bc5",
+                    "mixHash" : "0x15067a753093a1d43840d92d1d76b5eb1c73abfa3800f1c84f92f4021a1444fd",
+                    "nonce" : "0xcadbb79410df41d6",
                     "number" : "0x01",
                     "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
-                    "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
-                    "stateRoot" : "0xd00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0xca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0cd65cd05f406ee436bb8911933f3e2dbadb361f81339fb54ed637d1e66c33b8b882891e3dab3895743f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a015067a753093a1d43840d92d1d76b5eb1c73abfa3800f1c84f92f4021a1444fd88cadbb79410df41d6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca9b8f23bc1d375a5e8b8a1cb6183a839013dfe89c797f91603aac815c960cdc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x379395b7c0313954eb3ad5f1bdc2f95b76adc0141f4aa0cf3011d38028c96bc5",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c15261f9c15160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb-31_d0g0v0_Frontier" : {
+    "mem64kb-31_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/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x8edefab8fedf9e77ec0cae7d9836e6b064931f791c67be6a9879316cda4d01e5",
-                    "mixHash" : "0xd89556ef2267540922cfb78814b31ecc88f06f987342bd5572a90b8e858c359d",
-                    "nonce" : "0xf0bfe6997973682d",
+                    "hash" : "0xb67b8ee70069f52f08e3847df56c914d4e93f670e28b559d7980cd208544899e",
+                    "mixHash" : "0xe91643b7c724c91bdb9fd405554f8929f893d4ba0d9425ca1abe39c946c97852",
+                    "nonce" : "0x50fcb394f7b98795",
                     "number" : "0x01",
                     "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
                     "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0d89556ef2267540922cfb78814b31ecc88f06f987342bd5572a90b8e858c359d88f0bfe6997973682df863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0e91643b7c724c91bdb9fd405554f8929f893d4ba0d9425ca1abe39c946c978528850fcb394f7b98795f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8edefab8fedf9e77ec0cae7d9836e6b064931f791c67be6a9879316cda4d01e5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb67b8ee70069f52f08e3847df56c914d4e93f670e28b559d7980cd208544899e",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb-31_d0g0v0_Homestead" : {
+    "mem64kb-31_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/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0xcf71802954adf4af5bb79362c06391f8ff8195bc973505b969b232340fb06407",
-                    "mixHash" : "0x3cdb8251bd26b40a46b2046026dd20045fe67e67cb502b63ead2f0d88b341eb8",
-                    "nonce" : "0x9ecf0e74bb48796e",
+                    "hash" : "0x540f9c1f57736d26482ea24bae2c2cf07369c85835d6c59b27452e044a208399",
+                    "mixHash" : "0x8d78099bde91b62312bff1211d7a9c2922d01c08000e7abc376afbd13c3ab690",
+                    "nonce" : "0x916bfc1862765d3c",
                     "number" : "0x01",
                     "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
                     "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a03cdb8251bd26b40a46b2046026dd20045fe67e67cb502b63ead2f0d88b341eb8889ecf0e74bb48796ef863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a08d78099bde91b62312bff1211d7a9c2922d01c08000e7abc376afbd13c3ab69088916bfc1862765d3cf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf71802954adf4af5bb79362c06391f8ff8195bc973505b969b232340fb06407",
-        "network" : "Homestead",
+        "lastblockhash" : "0x540f9c1f57736d26482ea24bae2c2cf07369c85835d6c59b27452e044a208399",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb-31_d0g0v0_Metropolis" : {
+    "mem64kb-31_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/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x7cb405a68fed16e2b68c6b1c9268368eb0881c7c8e9bec14575758f00b2d8e58",
-                    "mixHash" : "0x8de291b14ebb43d1365b35e7bde66c520e3ce433c41e124d3760ef6255dab121",
-                    "nonce" : "0x94941b80c67b49ad",
+                    "hash" : "0x0a44699c47e1f8ca6d7a4406403bbd72528531742f7dd376d956cad9675c7cf2",
+                    "mixHash" : "0xec6dbf5b65498b99b4b63cadfe8af022ae62b1475652d7d137ca59becc83dab9",
+                    "nonce" : "0x72fb623e2c22c041",
                     "number" : "0x01",
                     "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
-                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
-                    "stateRoot" : "0xca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60",
+                    "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
+                    "stateRoot" : "0xd00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6fe2bd8aa6bf9c60d247d4abd577b1342a3eb119d3835a8f0700e13841dd60a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a08de291b14ebb43d1365b35e7bde66c520e3ce433c41e124d3760ef6255dab1218894941b80c67b49adf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0ec6dbf5b65498b99b4b63cadfe8af022ae62b1475652d7d137ca59becc83dab98872fb623e2c22c041f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb405a68fed16e2b68c6b1c9268368eb0881c7c8e9bec14575758f00b2d8e58",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0a44699c47e1f8ca6d7a4406403bbd72528531742f7dd376d956cad9675c7cf2",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9c15261f9c15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52453",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedba3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9c15261f9c15160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb-31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb-31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012453",
+                    "hash" : "0x55265446ad5094fccb7a475441b1ff20eaa93f2fb72edca4aca04cbe0df72e15",
+                    "mixHash" : "0xbfc3c467d172c5a0963ce3351ab579fccf02dc78a470e8611cb258875d1e9bcd",
+                    "nonce" : "0xc38688a2ffb3b7d3",
+                    "number" : "0x01",
+                    "parentHash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
+                    "receiptTrie" : "0x630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4",
+                    "stateRoot" : "0xd00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0be7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d00e008e6123c9053c341c937d830e1b5ec1d45f3956cf944b3aa8c6bcd8fdb3a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0630e82bcbbcb974f27ade5ecfd8412e3c4971b0239f0ccc8c603f50b3aa770f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0bfc3c467d172c5a0963ce3351ab579fccf02dc78a470e8611cb258875d1e9bcd88c38688a2ffb3b7d3f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x500018d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699",
+                        "s" : "0x51e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bff",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xbe7cffa43b0368cc34158555b0fe659a4cb781778154fc3bde801c4e1a1a536e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd50241ae9293f1b9c061693b99a7ca7ed6dabfa7fe60123e5efe649aae4045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x55265446ad5094fccb7a475441b1ff20eaa93f2fb72edca4aca04cbe0df72e15",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c15261f9c15160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-32_d0g0v0.json
index 15e71f2cf..d46d3872a 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb-32_d0g0v0_EIP150" : {
+    "mem64kb-32_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/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x2bb621ac25c4db46b147ef3e4e047853d6a41f2bfeda478c823104a02f1ae591",
-                    "mixHash" : "0x9e6f9f723ee0757a65363bda4f704646bc926044c78727e97053439505ae5654",
-                    "nonce" : "0xe819a5e57a6176c1",
+                    "hash" : "0xaae6e1e991ed299c78a861aefbf3ef3da52fc2aaff60e8a866af2fafae207aca",
+                    "mixHash" : "0x8a1788dfa5158949cee91ff2f17bb21c74142c4aac78bec14b79223fe6a0906b",
+                    "nonce" : "0xe7507063662805e6",
                     "number" : "0x01",
                     "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
-                    "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
-                    "stateRoot" : "0x1216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2",
+                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
+                    "stateRoot" : "0xe97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a09e6f9f723ee0757a65363bda4f704646bc926044c78727e97053439505ae565488e819a5e57a6176c1f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31ea081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a08a1788dfa5158949cee91ff2f17bb21c74142c4aac78bec14b79223fe6a0906b88e7507063662805e6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bb621ac25c4db46b147ef3e4e047853d6a41f2bfeda478c823104a02f1ae591",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaae6e1e991ed299c78a861aefbf3ef3da52fc2aaff60e8a866af2fafae207aca",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c05261f9c05160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb-32_d0g0v0_EIP158" : {
+    "mem64kb-32_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/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x2fd239e916b5a4a0e408c9f8c539f28723e12041990fe81e120102e0e671dda9",
-                    "mixHash" : "0xb16d68cf5bfd95121ca839580073c326e655bfa2dec7d9ff6c7e3b9995573f2e",
-                    "nonce" : "0x7789518d1bbc2647",
+                    "hash" : "0xea29721ffb58b224acaaf7fa2fc58c0ffcced0ab9d7ff56d3e720279d374f916",
+                    "mixHash" : "0x74fe4fe628f3a53a386767e2d6119471d997178166ae4b302c8669b81699d1dc",
+                    "nonce" : "0x4bc576846cde3d1a",
                     "number" : "0x01",
                     "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
-                    "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
-                    "stateRoot" : "0x1216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2",
+                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
+                    "stateRoot" : "0xe97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0b16d68cf5bfd95121ca839580073c326e655bfa2dec7d9ff6c7e3b9995573f2e887789518d1bbc2647f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31ea081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a074fe4fe628f3a53a386767e2d6119471d997178166ae4b302c8669b81699d1dc884bc576846cde3d1af863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fd239e916b5a4a0e408c9f8c539f28723e12041990fe81e120102e0e671dda9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xea29721ffb58b224acaaf7fa2fc58c0ffcced0ab9d7ff56d3e720279d374f916",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c05261f9c05160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb-32_d0g0v0_Frontier" : {
+    "mem64kb-32_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/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0xae38439bedf6cf34fa4c2f96e24f5d8bab018873bf6ea5bf95bbb5b461198cea",
-                    "mixHash" : "0xa6f65f17677346f9884f240131f6e0cff67624b88515342eca57eb2566a2017c",
-                    "nonce" : "0x2fdf39b590504e8d",
+                    "hash" : "0x1aba13f2830fad30f54512a32ab2d572a721e523d9adfe85f16c0f5e3855902e",
+                    "mixHash" : "0x1dfb7dbcb228e1f8fb4e166dbbc6012bf4b6e58f738efecb26d5210cf9d1cfa7",
+                    "nonce" : "0x950cbb49a1325528",
                     "number" : "0x01",
                     "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
                     "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0a6f65f17677346f9884f240131f6e0cff67624b88515342eca57eb2566a2017c882fdf39b590504e8df863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a01dfb7dbcb228e1f8fb4e166dbbc6012bf4b6e58f738efecb26d5210cf9d1cfa788950cbb49a1325528f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae38439bedf6cf34fa4c2f96e24f5d8bab018873bf6ea5bf95bbb5b461198cea",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1aba13f2830fad30f54512a32ab2d572a721e523d9adfe85f16c0f5e3855902e",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb-32_d0g0v0_Homestead" : {
+    "mem64kb-32_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/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x7f7e2d086dc7b44dd70c40de8900774f15acc722d53eebca0bb3ceb7d7108479",
-                    "mixHash" : "0x910ee5ab2edc89a7048594f34b42d186108392503cf48ea7fc47ab3eea63ba27",
-                    "nonce" : "0x657614dbeb2180f0",
+                    "hash" : "0x30b7482bddca2994b0daada361a99b26976ffeb19cee86f6587da6ac532b9522",
+                    "mixHash" : "0x3cbb8736cf2be8c0610ab517a201a43db377579abbd3237ab02f474c15459638",
+                    "nonce" : "0x7ab3088471ff2194",
                     "number" : "0x01",
                     "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
                     "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0910ee5ab2edc89a7048594f34b42d186108392503cf48ea7fc47ab3eea63ba2788657614dbeb2180f0f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a03cbb8736cf2be8c0610ab517a201a43db377579abbd3237ab02f474c15459638887ab3088471ff2194f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f7e2d086dc7b44dd70c40de8900774f15acc722d53eebca0bb3ceb7d7108479",
-        "network" : "Homestead",
+        "lastblockhash" : "0x30b7482bddca2994b0daada361a99b26976ffeb19cee86f6587da6ac532b9522",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb-32_d0g0v0_Metropolis" : {
+    "mem64kb-32_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/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x541ea85520d4e607157e1f6128188e0ee71fb2590013359d0ca98c81e1a676d1",
-                    "mixHash" : "0xa4146a16d9aaecc2f524064dc3b709e3ca113049270b57b47c0e5df5fd3fcaf8",
-                    "nonce" : "0x4530f07c7caf4e86",
+                    "hash" : "0x77433e4147cb499df00e26bb04eff191d3327487b0ee88a75b357acca07b4e05",
+                    "mixHash" : "0x118e0eba1802b7cc2e827bfca0d3806c50c4bc7a810ca4db422f1d9af5849189",
+                    "nonce" : "0x266438f00af4a222",
                     "number" : "0x01",
                     "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
-                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
-                    "stateRoot" : "0xe97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31e",
+                    "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
+                    "stateRoot" : "0x1216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97b6cf9182b5fd4a0850605d35f9188e77dd1709048ae4e26929bc28a86c31ea081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0a4146a16d9aaecc2f524064dc3b709e3ca113049270b57b47c0e5df5fd3fcaf8884530f07c7caf4e86f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0118e0eba1802b7cc2e827bfca0d3806c50c4bc7a810ca4db422f1d9af584918988266438f00af4a222f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x541ea85520d4e607157e1f6128188e0ee71fb2590013359d0ca98c81e1a676d1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x77433e4147cb499df00e26bb04eff191d3327487b0ee88a75b357acca07b4e05",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9c05261f9c05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf9e0",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52448",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedbae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9c05261f9c05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb-32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb-32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012448",
+                    "hash" : "0x11ea4710150d35dcf767d772e7196fae7c4b9e19f77540d14d1eb02492957e23",
+                    "mixHash" : "0x1367a21a00798dce99477ebbbdec012dd2657468f14432a8452845ac36827043",
+                    "nonce" : "0xdca50bdc76910e91",
+                    "number" : "0x01",
+                    "parentHash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
+                    "receiptTrie" : "0xbf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096",
+                    "stateRoot" : "0x1216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa09f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01216ea76b8911ba7cfffdea0a6b5a9de397ca4a6aa9a0ae4da41a60ee8029ae2a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0bf5c2b5116225c50d43b69c5f14f8ea902512d3b55fe05b4f54f876364880096b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a01367a21a00798dce99477ebbbdec012dd2657468f14432a8452845ac3682704388dca50bdc76910e91f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x500018d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699",
+                        "s" : "0x51e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bff",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x9f3f22e84a2049d5d79675328c645280fda98c6ca4eb3c7014db28fcfb039c68",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9ea",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea1623f7420c02b9df05a18ba5cd61ccbbf988f9ba226801ac049db6a663c9eaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x11ea4710150d35dcf767d772e7196fae7c4b9e19f77540d14d1eb02492957e23",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9c05261f9c05160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-33_d0g0v0.json
index 4441d1b07..9cff41633 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb-33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb-33_d0g0v0_EIP150" : {
+    "mem64kb-33_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/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x930278752a31f9b1b391c851b94ba67eeab4e8ccf4629b6c663163ffeecbe0b8",
-                    "mixHash" : "0xc5bef5a218a6956a60a3ddc514f0ba34749f732396d9a5bdaf7e883c79452c05",
-                    "nonce" : "0x06babb0e4e5c2945",
+                    "hash" : "0x4c47d9b511c6488a6020c2c4ff31569d3ada76c5785d37699d7fbf8b7f7966fa",
+                    "mixHash" : "0xe707ad3f8976bd6ec7f0fd48c722d37be9cda52331e3c93fc7ef948f8c47b39c",
+                    "nonce" : "0x34cc789ce0284385",
                     "number" : "0x01",
                     "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
-                    "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
-                    "stateRoot" : "0x8e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906",
+                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
+                    "stateRoot" : "0x7eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0c5bef5a218a6956a60a3ddc514f0ba34749f732396d9a5bdaf7e883c79452c058806babb0e4e5c2945f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0e707ad3f8976bd6ec7f0fd48c722d37be9cda52331e3c93fc7ef948f8c47b39c8834cc789ce0284385f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x930278752a31f9b1b391c851b94ba67eeab4e8ccf4629b6c663163ffeecbe0b8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4c47d9b511c6488a6020c2c4ff31569d3ada76c5785d37699d7fbf8b7f7966fa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9bf5261f9bf5160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb-33_d0g0v0_EIP158" : {
+    "mem64kb-33_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/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x100835e3254b319d4c5924eb558d6405d8b57a2260ae93e1c3985fd78fea774d",
-                    "mixHash" : "0xd2c38ecb699b487c949cb68a53a76e95adf746b9d2eeb2474c45eec3198a5cb7",
-                    "nonce" : "0x6fa8c986389d5d66",
+                    "hash" : "0x685a501034360b7e080f40efbf60e41e8fc330cd32e57524c22724cd993d9b53",
+                    "mixHash" : "0xec2727e8f424dc5494ef077703e4f41acfb701e96a71f741432fd626b4a73dd0",
+                    "nonce" : "0x2a55cef5bd5a6184",
                     "number" : "0x01",
                     "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
-                    "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
-                    "stateRoot" : "0x8e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906",
+                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
+                    "stateRoot" : "0x7eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0d2c38ecb699b487c949cb68a53a76e95adf746b9d2eeb2474c45eec3198a5cb7886fa8c986389d5d66f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0ec2727e8f424dc5494ef077703e4f41acfb701e96a71f741432fd626b4a73dd0882a55cef5bd5a6184f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x100835e3254b319d4c5924eb558d6405d8b57a2260ae93e1c3985fd78fea774d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x685a501034360b7e080f40efbf60e41e8fc330cd32e57524c22724cd993d9b53",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9bf5261f9bf5160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb-33_d0g0v0_Frontier" : {
+    "mem64kb-33_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/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x816806f243b20b7e64218ff287f94aec50cc89acae2d1abe455e3d37ad9c3a7f",
-                    "mixHash" : "0xf17ba587a4b6192d30606171f63008d3c088d3b6971136ae1184c35c80aab162",
-                    "nonce" : "0xadbe200bc6e1035c",
+                    "hash" : "0xa8aa5498f2c0c5bd4b70a55d0060bd50c1b5a37da33762515bea26c07e81faac",
+                    "mixHash" : "0xe36a8d9687eea4af8b9f71bf40e563a269b8fa83f5b701c5687f93b16cb09042",
+                    "nonce" : "0xc3519dda4d9cc52b",
                     "number" : "0x01",
                     "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
                     "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0f17ba587a4b6192d30606171f63008d3c088d3b6971136ae1184c35c80aab16288adbe200bc6e1035cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0e36a8d9687eea4af8b9f71bf40e563a269b8fa83f5b701c5687f93b16cb0904288c3519dda4d9cc52bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x816806f243b20b7e64218ff287f94aec50cc89acae2d1abe455e3d37ad9c3a7f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa8aa5498f2c0c5bd4b70a55d0060bd50c1b5a37da33762515bea26c07e81faac",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb-33_d0g0v0_Homestead" : {
+    "mem64kb-33_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/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0xc001a894a9471774456ffecaa1f8af119d46c60951f60c19feea8372a6c92b03",
-                    "mixHash" : "0x21369cfdb0d00a8dafd3711c4a8000bf22b89dbad6e1be1a6cb4c2f422d5004f",
-                    "nonce" : "0xcd57521467424371",
+                    "hash" : "0x1cd53014afdb11941b80dc85c4b7ab9ce18f82adb843a765cec9a475513a00f4",
+                    "mixHash" : "0xae494bdf4dcb558ac1d6880ba6bcb144695710877e756ee7c195b57337858846",
+                    "nonce" : "0xc61ab164090cbb61",
                     "number" : "0x01",
                     "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
                     "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a021369cfdb0d00a8dafd3711c4a8000bf22b89dbad6e1be1a6cb4c2f422d5004f88cd57521467424371f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0ae494bdf4dcb558ac1d6880ba6bcb144695710877e756ee7c195b5733785884688c61ab164090cbb61f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc001a894a9471774456ffecaa1f8af119d46c60951f60c19feea8372a6c92b03",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1cd53014afdb11941b80dc85c4b7ab9ce18f82adb843a765cec9a475513a00f4",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb-33_d0g0v0_Metropolis" : {
+    "mem64kb-33_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/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012448",
-                    "hash" : "0x9b392c8e6cc7783a2c74b106098844ea754b6a3059ce29687164cac6da767564",
-                    "mixHash" : "0xd24d1aba23e0b903d4b2ed548b399fbfefde426aad18ee5c3f90babb7b099bce",
-                    "nonce" : "0x39394e3706cc96de",
+                    "hash" : "0x93d9eabcd34b41147b7c2bd4f0a09c96430f021a734c8bfd1fa15ecc9b93961d",
+                    "mixHash" : "0xf13b7fbeeddc4dc41239d686902ef4e483f2ddd327720b9288e185ebb98ce334",
+                    "nonce" : "0xb77aa925bb423b5f",
                     "number" : "0x01",
                     "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
-                    "receiptTrie" : "0xec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bd",
-                    "stateRoot" : "0x7eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3",
+                    "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
+                    "stateRoot" : "0x8e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07eb102b727dd91732304d113c74b559cbfa0eb40c77e1fd5e2d7c44b8173e4b3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ec59aa15ffb2c0934e699d37b4feaf3d36db7c272d9017780562473b38c978bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0d24d1aba23e0b903d4b2ed548b399fbfefde426aad18ee5c3f90babb7b099bce8839394e3706cc96def863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a0f13b7fbeeddc4dc41239d686902ef4e483f2ddd327720b9288e185ebb98ce33488b77aa925bb423b5ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b392c8e6cc7783a2c74b106098844ea754b6a3059ce29687164cac6da767564",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x93d9eabcd34b41147b7c2bd4f0a09c96430f021a734c8bfd1fa15ecc9b93961d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9bf5261f9bf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf9e0",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52448",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedbae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9bf5261f9bf5160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb-33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb-33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012448",
+                    "hash" : "0x81b930b11b3c18a47a589851996569a1edb6e7a023bd4dc31016bb4cc67565a4",
+                    "mixHash" : "0x8c551d88a4b38a1c267107a28900b9e603f59a7e0933e7c9b6d33b64ae248e29",
+                    "nonce" : "0x0f6715973f00cef4",
+                    "number" : "0x01",
+                    "parentHash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
+                    "receiptTrie" : "0x91e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99ae",
+                    "stateRoot" : "0x8e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa002f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e85e88c573962f28983a083fbd76096b9b9d5cc42554ac613a8797666bce906a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa091e1c5708686ffcd30cb8e7d544ee3cbe247d32ec828958caced603f50ec99aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124488203e880a08c551d88a4b38a1c267107a28900b9e603f59a7e0933e7c9b6d33b64ae248e29880f6715973f00cef4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x02f7864d2c2acc2ce3fac84e9d7b145a13626a3b83770c21116f440917731b30",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e799c42d6a1fdc1d486152ce65c9803007749549da95f418ca4817e16472b655a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81b930b11b3c18a47a589851996569a1edb6e7a023bd4dc31016bb4cc67565a4",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9bf5261f9bf5160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
index bcd06fdca..9c5fe8637 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_d0g0v0_EIP150" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x5ec89aada66c4368b00e77d69ca84d658dc830b58f92084350e4706a609d111e",
-                    "mixHash" : "0xaadbcd44ff437093f0f648e328d0501e3ff7d87dd27a4436ca405516b21a03bf",
-                    "nonce" : "0x14bf300fff7149cc",
+                    "hash" : "0x2b25cb3795f8fea4397319140b089ab76d83c3ab2ed88f7b3174d78cbde231c6",
+                    "mixHash" : "0x21168e1023e67454b8432bd4f27356611c40ae6b5fb081e67f488d5908832304",
+                    "nonce" : "0x88517a1a970d32bb",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
-                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0aadbcd44ff437093f0f648e328d0501e3ff7d87dd27a4436ca405516b21a03bf8814bf300fff7149ccf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a021168e1023e67454b8432bd4f27356611c40ae6b5fb081e67f488d59088323048888517a1a970d32bbf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ec89aada66c4368b00e77d69ca84d658dc830b58f92084350e4706a609d111e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2b25cb3795f8fea4397319140b089ab76d83c3ab2ed88f7b3174d78cbde231c6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_EIP158" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x6cc6220c6b307413c320951607c9369f7714478c48a42fe5029ca2449bbf40d2",
-                    "mixHash" : "0xda3c417064a9093aeead95619be685cb35cc20bec4d300839df4422e7164d2ea",
-                    "nonce" : "0x5dedee6ab0c848c7",
+                    "hash" : "0x77ed8cf41e1b91edf8f9ad83eff546f9e38b0bfae567058e424948be75e30a81",
+                    "mixHash" : "0x287d01df45eb5d5759cbca32e2eff00ee5d018936866e16be8eed7ef3c6c90aa",
+                    "nonce" : "0x513e0e5f86596970",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
-                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0da3c417064a9093aeead95619be685cb35cc20bec4d300839df4422e7164d2ea885dedee6ab0c848c7f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0287d01df45eb5d5759cbca32e2eff00ee5d018936866e16be8eed7ef3c6c90aa88513e0e5f86596970f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cc6220c6b307413c320951607c9369f7714478c48a42fe5029ca2449bbf40d2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x77ed8cf41e1b91edf8f9ad83eff546f9e38b0bfae567058e424948be75e30a81",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Frontier" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x7096d868e433701be47c5dfc3d5b59b278f0c6d5b47238fb251e75f1493938d4",
-                    "mixHash" : "0x5cf0b2e8b0568ea77df4eeae1e8eddac6fdf7c906b2c3a919329a5e661ef1593",
-                    "nonce" : "0x27cea3577e968012",
+                    "hash" : "0x8881c99c8b97e8e24dd577763e071edaebadb7965f38142e75ab8ab06e2ef361",
+                    "mixHash" : "0x697380ab8d449f210b91bf377ac7b077a26a15a1a6399582ad40727b3c7f22f6",
+                    "nonce" : "0xf03a3f718a21eca6",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
                     "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a05cf0b2e8b0568ea77df4eeae1e8eddac6fdf7c906b2c3a919329a5e661ef15938827cea3577e968012f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0697380ab8d449f210b91bf377ac7b077a26a15a1a6399582ad40727b3c7f22f688f03a3f718a21eca6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7096d868e433701be47c5dfc3d5b59b278f0c6d5b47238fb251e75f1493938d4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8881c99c8b97e8e24dd577763e071edaebadb7965f38142e75ab8ab06e2ef361",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Homestead" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x192c973b568c8e35620978ff5bda0f5c4a9a52a5eda2fda0a83d55ae46f0de69",
-                    "mixHash" : "0x08d1c209594bb4892cc07fea9fd36601a6b92083f5dcf00b9782bee8cb822957",
-                    "nonce" : "0x1a4850ddb32364a6",
+                    "hash" : "0xf45843fe210491fe07ff9edc29392d43dc3399103fedef80601252b32d4ff7d2",
+                    "mixHash" : "0xfbf37399fc6974fd01f94f0aaae529c17ceb2fc46fbdb7aa19a285324a178552",
+                    "nonce" : "0x2a784591260bc3de",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
                     "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a008d1c209594bb4892cc07fea9fd36601a6b92083f5dcf00b9782bee8cb822957881a4850ddb32364a6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0fbf37399fc6974fd01f94f0aaae529c17ceb2fc46fbdb7aa19a285324a178552882a784591260bc3def863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x192c973b568c8e35620978ff5bda0f5c4a9a52a5eda2fda0a83d55ae46f0de69",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf45843fe210491fe07ff9edc29392d43dc3399103fedef80601252b32d4ff7d2",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Metropolis" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x14a6fbb2b8b91e23e7b4b2314a6154aaaed829135650f0b2371e9433cdb7e9ab",
-                    "mixHash" : "0xca611eaa12c9a0208c5b8a73623c885594465f919b4fca5d2bca9e848bcc5fec",
-                    "nonce" : "0x2766eeaaf3799577",
+                    "hash" : "0xd522ae1f627521d2d2f7eafdb1a4d7a1b3ba79f7ae1b6c84510a1f8b369fbad4",
+                    "mixHash" : "0xbb6b8a5a116346e2763228d44fdf62be27fbd8a4423ee77bfd38284f8585df17",
+                    "nonce" : "0xda1629563c25ff5f",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
-                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
+                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
+                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0ca611eaa12c9a0208c5b8a73623c885594465f919b4fca5d2bca9e848bcc5fec882766eeaaf3799577f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0bb6b8a5a116346e2763228d44fdf62be27fbd8a4423ee77bfd38284f8585df1788da1629563c25ff5ff863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14a6fbb2b8b91e23e7b4b2314a6154aaaed829135650f0b2371e9433cdb7e9ab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd522ae1f627521d2d2f7eafdb1a4d7a1b3ba79f7ae1b6c84510a1f8b369fbad4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9e05261f9e05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52453",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedba3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9e05261f9e05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012453",
+                    "hash" : "0x10968fc914e113edda0c76687ef870674cabc18b3bf839d00c3004c436daf04e",
+                    "mixHash" : "0x062038f73ca4730db4d70948d01a1412f664009bf842102e6e17744c005a38f1",
+                    "nonce" : "0x1b88cfe3cd7e039a",
+                    "number" : "0x01",
+                    "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
+                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
+                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0062038f73ca4730db4d70948d01a1412f664009bf842102e6e17744c005a38f1881b88cfe3cd7e039af863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x500018d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699",
+                        "s" : "0x51e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bff",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x10968fc914e113edda0c76687ef870674cabc18b3bf839d00c3004c436daf04e",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1_d0g0v0.json
index a0c4516df..52e1dc511 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte+1_d0g0v0_EIP150" : {
+    "mem64kb_singleByte+1_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/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x24538b6e9ccb2b4123294b7238a4e8f2c496f0d7bb50afb8d85428097ddb2c28",
-                    "mixHash" : "0x47d0143060655e85b41802dd64eaa6cef3265c1b92a38dee324e2d83e9962246",
-                    "nonce" : "0x6f6b6860412252e5",
+                    "hash" : "0xdc00c84fa9620f4218353d566891e6fd8abe973596a9b2196e64f38ea5bc765e",
+                    "mixHash" : "0xd3623bfaf57960f3a3652948fd2cd4b20adc24da7e79074ece188c725247e444",
+                    "nonce" : "0xb1d205fdf6a06a0f",
                     "number" : "0x01",
                     "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
-                    "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
-                    "stateRoot" : "0x04d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cc",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0x579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a047d0143060655e85b41802dd64eaa6cef3265c1b92a38dee324e2d83e9962246886f6b6860412252e5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0d3623bfaf57960f3a3652948fd2cd4b20adc24da7e79074ece188c725247e44488b1d205fdf6a06a0ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24538b6e9ccb2b4123294b7238a4e8f2c496f0d7bb50afb8d85428097ddb2c28",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdc00c84fa9620f4218353d566891e6fd8abe973596a9b2196e64f38ea5bc765e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte+1_d0g0v0_EIP158" : {
+    "mem64kb_singleByte+1_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/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x87d13a069630cdc8e6caf12bf2e3814450d50585ab441e85929317c9c85997e8",
-                    "mixHash" : "0xe9c44bd41767c6b5cd9a0e470f603aa79b9c454913658db370761297bced1239",
-                    "nonce" : "0x760912f673b2510c",
+                    "hash" : "0xec87697cc08730f148b7a3f32f700a1b89586c2c42833788b5009aa6ac19846d",
+                    "mixHash" : "0x1db18074b84a8e0af4ea02734f2e14787173dc12f0a46fb613d1d2adf6465fa4",
+                    "nonce" : "0x3b4bf56fe848e69d",
                     "number" : "0x01",
                     "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
-                    "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
-                    "stateRoot" : "0x04d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cc",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0x579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0e9c44bd41767c6b5cd9a0e470f603aa79b9c454913658db370761297bced123988760912f673b2510cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a01db18074b84a8e0af4ea02734f2e14787173dc12f0a46fb613d1d2adf6465fa4883b4bf56fe848e69df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87d13a069630cdc8e6caf12bf2e3814450d50585ab441e85929317c9c85997e8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xec87697cc08730f148b7a3f32f700a1b89586c2c42833788b5009aa6ac19846d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte+1_d0g0v0_Frontier" : {
+    "mem64kb_singleByte+1_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/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x4198ffda971353ee5f9f6c27fab69a6efcac5ccbf6c3b34859e80d80b2bea8a1",
-                    "mixHash" : "0x48e5043627204b45bd17913c1fe9fe465ba3b73d9ce63180c03507559fea76ee",
-                    "nonce" : "0x0c4efda7c752da6f",
+                    "hash" : "0xfd16bd306f09aa9b1dd132c14bad4448e26cf62ff69b9eeb7787ac3f4e6506a5",
+                    "mixHash" : "0xd5e2c45b5e96e88c4a7f53ecb2afb98c0ed4b1f26dad3a53ccf1877b64d7318c",
+                    "nonce" : "0x941d4f49ae754446",
                     "number" : "0x01",
                     "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
                     "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a048e5043627204b45bd17913c1fe9fe465ba3b73d9ce63180c03507559fea76ee880c4efda7c752da6ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0d5e2c45b5e96e88c4a7f53ecb2afb98c0ed4b1f26dad3a53ccf1877b64d7318c88941d4f49ae754446f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4198ffda971353ee5f9f6c27fab69a6efcac5ccbf6c3b34859e80d80b2bea8a1",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfd16bd306f09aa9b1dd132c14bad4448e26cf62ff69b9eeb7787ac3f4e6506a5",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte+1_d0g0v0_Homestead" : {
+    "mem64kb_singleByte+1_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/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0xb47d3de3cf2c17f7a191595c020fc1ddff3b4f6153e8e161b457c79b169bd711",
-                    "mixHash" : "0xb99e7e354f5fa6d7a2ccf6b67faab3fb1cd73b97fe45de9765acc10d51071720",
-                    "nonce" : "0xc03b6a67f53dc1ee",
+                    "hash" : "0x6007010770292cc79e2cdba2c4d98c8e7218d59358be770161879193085de187",
+                    "mixHash" : "0x17e15379ff3480273c745ce880fb9f557e97227c6663f417c68e4596eab8fbb5",
+                    "nonce" : "0x142bbea2f0c9ab97",
                     "number" : "0x01",
                     "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
                     "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0b99e7e354f5fa6d7a2ccf6b67faab3fb1cd73b97fe45de9765acc10d5107172088c03b6a67f53dc1eef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a017e15379ff3480273c745ce880fb9f557e97227c6663f417c68e4596eab8fbb588142bbea2f0c9ab97f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb47d3de3cf2c17f7a191595c020fc1ddff3b4f6153e8e161b457c79b169bd711",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6007010770292cc79e2cdba2c4d98c8e7218d59358be770161879193085de187",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte+1_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte+1_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/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x9704eddc109c2347a8f3077aad44ebf85899424802692135150db4175a6eec57",
-                    "mixHash" : "0x9b42f44cf7a2f57043f35b54a883d4c6ade7d4798ebe4c6ad6240c2143ac8271",
-                    "nonce" : "0x813f044d8d8dd4b5",
+                    "hash" : "0xa993df5fa01d85c4f69df36404afeabadfb6dc334859b4aded4ab3f122883f01",
+                    "mixHash" : "0x484f3cbde633921589ef9d87bde5993489161a81699692a393ee480898470166",
+                    "nonce" : "0xeabdbfe7ff280e3f",
                     "number" : "0x01",
                     "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
-                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
-                    "stateRoot" : "0x579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5",
+                    "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
+                    "stateRoot" : "0x04d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0579dcfd1a2eb0b830cc1571b1d69f121ba9498c56c9bfb2a799b8ac9ba8eb4a5a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a09b42f44cf7a2f57043f35b54a883d4c6ade7d4798ebe4c6ad6240c2143ac827188813f044d8d8dd4b5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0484f3cbde633921589ef9d87bde5993489161a81699692a393ee48089847016688eabdbfe7ff280e3ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9704eddc109c2347a8f3077aad44ebf85899424802692135150db4175a6eec57",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa993df5fa01d85c4f69df36404afeabadfb6dc334859b4aded4ab3f122883f01",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d635",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29c1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa005359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte+1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte+1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd635",
+                    "hash" : "0x43f29022fabda2b7c83a299188db6c900b3a4520e177c231c2d8996000a06d54",
+                    "mixHash" : "0x0cb1d1800d9ce5b469a94db7a0057b75addeeff58fbdaa34aef6fe8490150738",
+                    "nonce" : "0x28f021cb8a249d86",
+                    "number" : "0x01",
+                    "parentHash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
+                    "receiptTrie" : "0xb831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240c",
+                    "stateRoot" : "0x04d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a06df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004d96b86f3735d2732b1f79f66637d901d49507dea390d84fa1dc47d148204cca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b831443372a46b7b77af12e93ef7b1cf5b2d051a927afeab001242903c00240cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a00cb1d1800d9ce5b469a94db7a0057b75addeeff58fbdaa34aef6fe84901507388828f021cb8a249d86f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x6df7f1308cbe2037b80335930b8808f41cbf8537d00d46449989e87fcd126e1c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbd7dde09e84ec962eb482f8c66a14d27f1eb488462c2b9c14f9aa25ccdf2dc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x43f29022fabda2b7c83a299188db6c900b3a4520e177c231c2d8996000a06d54",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa005359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31_d0g0v0.json
index 821ad2bb6..d9793194d 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte+31_d0g0v0_EIP150" : {
+    "mem64kb_singleByte+31_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/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0xbf491363a4c01a52fd446cf42c0a8c3c68a63986d995e45d8e24a61f7e053e45",
-                    "mixHash" : "0x83fbfc79984a1ad7307c335812003b8997b1625a08c4fe68b2e3cdb70643259c",
-                    "nonce" : "0xf95679a18f77880f",
+                    "hash" : "0xb699943974767d6d066e41fbf435849bf9908eafba0e2c4d09c9c5a48963dcff",
+                    "mixHash" : "0x8e6b254027340d9b243fb86e159e7a8dbdbab04d4b163f1ac8f36de48fe5c2e1",
+                    "nonce" : "0x25edb7cfe9c5da84",
                     "number" : "0x01",
                     "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
-                    "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
-                    "stateRoot" : "0xb12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0xa96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a083fbfc79984a1ad7307c335812003b8997b1625a08c4fe68b2e3cdb70643259c88f95679a18f77880ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a08e6b254027340d9b243fb86e159e7a8dbdbab04d4b163f1ac8f36de48fe5c2e18825edb7cfe9c5da84f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf491363a4c01a52fd446cf42c0a8c3c68a63986d995e45d8e24a61f7e053e45",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb699943974767d6d066e41fbf435849bf9908eafba0e2c4d09c9c5a48963dcff",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1e5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte+31_d0g0v0_EIP158" : {
+    "mem64kb_singleByte+31_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/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x9ba29fe57bdb033932d6e60952406a36db5ad01e22d526523a719cfb852c3c05",
-                    "mixHash" : "0x96ae94960f7e0f3a06aeb4d08400cf554030dc1757c982db6c263b00143493c8",
-                    "nonce" : "0xec52c1cb13723896",
+                    "hash" : "0x4415524fe80bf7e660a761eb5c02b1bd5d9cfec87774a2bd926132b697b3ae9c",
+                    "mixHash" : "0x6686b582a84eefd7eb3d4bb05b28bc129ec98c2cd0aad71df296202500612f4b",
+                    "nonce" : "0x9e49f9dc87b33f67",
                     "number" : "0x01",
                     "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
-                    "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
-                    "stateRoot" : "0xb12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0xa96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a096ae94960f7e0f3a06aeb4d08400cf554030dc1757c982db6c263b00143493c888ec52c1cb13723896f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a06686b582a84eefd7eb3d4bb05b28bc129ec98c2cd0aad71df296202500612f4b889e49f9dc87b33f67f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ba29fe57bdb033932d6e60952406a36db5ad01e22d526523a719cfb852c3c05",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4415524fe80bf7e660a761eb5c02b1bd5d9cfec87774a2bd926132b697b3ae9c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1e5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte+31_d0g0v0_Frontier" : {
+    "mem64kb_singleByte+31_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/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x910ab4ec0f5e1190f83ea453bf814d405e4f2c3c0472588a490012b0498a0e31",
-                    "mixHash" : "0xfa2628fc6a3144923fae51bbd2b7f7ec7688d9fe48f875d89acc2033a5169564",
-                    "nonce" : "0x282851ac585c1957",
+                    "hash" : "0x292aeb3e1416978a0d48c80e58d207166aef651f580f6c5e6ddc070ce8025b8b",
+                    "mixHash" : "0xc62364a921e0ab2a5558576e83562dabc524a77c54de6a55359d026261214722",
+                    "nonce" : "0x07de9e560c89b1ee",
                     "number" : "0x01",
                     "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
                     "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0fa2628fc6a3144923fae51bbd2b7f7ec7688d9fe48f875d89acc2033a516956488282851ac585c1957f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0c62364a921e0ab2a5558576e83562dabc524a77c54de6a55359d0262612147228807de9e560c89b1eef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x910ab4ec0f5e1190f83ea453bf814d405e4f2c3c0472588a490012b0498a0e31",
-        "network" : "Frontier",
+        "lastblockhash" : "0x292aeb3e1416978a0d48c80e58d207166aef651f580f6c5e6ddc070ce8025b8b",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte+31_d0g0v0_Homestead" : {
+    "mem64kb_singleByte+31_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/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x1a707f1065653d102dd64d5425d527c3ecdb47a970a825ff26a9f91f04c996fb",
-                    "mixHash" : "0x1b1dbdbbe0685e5b607dcbb1b5b8bc7520c24034e064645d2a1840b23d3d438a",
-                    "nonce" : "0xac4139ba14e53bf2",
+                    "hash" : "0x782751d11cb9d58d3a1d66fa8e68ad97c2c8491f5e53d4b2759193303ff2ecf5",
+                    "mixHash" : "0x451f605e12cf820e18570712794ae3fa4d24fc0022cd523edf034fe2489bdf22",
+                    "nonce" : "0xe81fed87a86b3b6c",
                     "number" : "0x01",
                     "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
                     "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a01b1dbdbbe0685e5b607dcbb1b5b8bc7520c24034e064645d2a1840b23d3d438a88ac4139ba14e53bf2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0451f605e12cf820e18570712794ae3fa4d24fc0022cd523edf034fe2489bdf2288e81fed87a86b3b6cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a707f1065653d102dd64d5425d527c3ecdb47a970a825ff26a9f91f04c996fb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x782751d11cb9d58d3a1d66fa8e68ad97c2c8491f5e53d4b2759193303ff2ecf5",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte+31_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte+31_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/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x7016c781d828bc2470768997cb02ea1f003928e239cf8bc494c11cb2483f193e",
-                    "mixHash" : "0x30c6f225d59523964a7e35174faa1f589bf573e1276a0431ef414c5c74c58418",
-                    "nonce" : "0xd2d4180bf105a915",
+                    "hash" : "0xdfa8b703416b8d5a4bd5c86d70167457cd7c1b28f95b820ffc87f0f8cb2baffa",
+                    "mixHash" : "0x3ec6d0079b272f50a7b96a9e61be4199ee6df17ecb23a740396fccadec479968",
+                    "nonce" : "0xef9f381d3c7c166e",
                     "number" : "0x01",
                     "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
-                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
-                    "stateRoot" : "0xa96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3",
+                    "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
+                    "stateRoot" : "0xb12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a96e9f36504226058787eaec48d55c3f1add395e1feee13101ff5218838f08c3a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a030c6f225d59523964a7e35174faa1f589bf573e1276a0431ef414c5c74c5841888d2d4180bf105a915f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a03ec6d0079b272f50a7b96a9e61be4199ee6df17ecb23a740396fccadec47996888ef9f381d3c7c166ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7016c781d828bc2470768997cb02ea1f003928e239cf8bc494c11cb2483f193e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdfa8b703416b8d5a4bd5c86d70167457cd7c1b28f95b820ffc87f0f8cb2baffa",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa1e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d635",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29c1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa1e5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte+31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte+31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd635",
+                    "hash" : "0xdbd504b15222bcb39ac57d086ef940fa37be3604b1203f59adb69dbb6f90a074",
+                    "mixHash" : "0xa5b6609dfa96a59dc071e01e9970f6b4e6c246ca0000b24ecc5ea25cc6411a6c",
+                    "nonce" : "0xd63904e28f8a4a64",
+                    "number" : "0x01",
+                    "parentHash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
+                    "receiptTrie" : "0xbd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0e",
+                    "stateRoot" : "0xb12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0b415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b12af828be7cce949855be2531bbcfc4a3a76571701a6569f63ec53dc23f26b1a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0bd49f9c06ca5e0765dae3fcff54a9fa371854237d7e0697fdd2fb0d63f555c0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0a5b6609dfa96a59dc071e01e9970f6b4e6c246ca0000b24ecc5ea25cc6411a6c88d63904e28f8a4a64f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xb415c97547c006d8ba2b12216e4fd2ba7420765f2bb725f787a481ba45244505",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028c5b38ce18b82cb2f16b1803cfc5f7034ef56ef870c66787b21335bfc67c8fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdbd504b15222bcb39ac57d086ef940fa37be3604b1203f59adb69dbb6f90a074",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1e5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32_d0g0v0.json
index 2a9a50463..ec730b235 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte+32_d0g0v0_EIP150" : {
+    "mem64kb_singleByte+32_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/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x2509ed20740979a27d976b1f402453f5fc280017a12b4bdbdff2cb95a1d44f0b",
-                    "mixHash" : "0xbe25945163f1c6bb61624b04797c7ac8bae84e6dbc1af19619f50be098577b6e",
-                    "nonce" : "0x05c51911aa2daf6d",
+                    "hash" : "0xc4cdda462c51fa3503b896db952ced39182c5e1476f67d8d2f14fe79b51a8233",
+                    "mixHash" : "0x7943be11279b8f0c4bdc0833805624f56b9087d2d6f5559040738818326d1110",
+                    "nonce" : "0xf1296fc23dc46502",
                     "number" : "0x01",
                     "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
-                    "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
-                    "stateRoot" : "0x6afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0xc4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0be25945163f1c6bb61624b04797c7ac8bae84e6dbc1af19619f50be098577b6e8805c51911aa2daf6df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a07943be11279b8f0c4bdc0833805624f56b9087d2d6f5559040738818326d111088f1296fc23dc46502f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2509ed20740979a27d976b1f402453f5fc280017a12b4bdbdff2cb95a1d44f0b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc4cdda462c51fa3503b896db952ced39182c5e1476f67d8d2f14fe79b51a8233",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1f5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte+32_d0g0v0_EIP158" : {
+    "mem64kb_singleByte+32_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/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0xd1ef557e7b623ea9a0ab3d65fd175768e5c84aff71e4fe204b3a017384a70b37",
-                    "mixHash" : "0x5516b8662b3945ae1e4fcb4bbde7fa1e5d2881576a20685b24c76cf9f342de12",
-                    "nonce" : "0x5ba3b1941d0ac1f5",
+                    "hash" : "0x224a17aaa8033800f11cc8ade5cce7bffab51226a315f7a647da95972b37a6f8",
+                    "mixHash" : "0xdd6310a9d452c93ecd840d7dbbdf202e7602c25a134746228dc6639961876479",
+                    "nonce" : "0x91423a29a9c740c0",
                     "number" : "0x01",
                     "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
-                    "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
-                    "stateRoot" : "0x6afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633",
+                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
+                    "stateRoot" : "0xc4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a05516b8662b3945ae1e4fcb4bbde7fa1e5d2881576a20685b24c76cf9f342de12885ba3b1941d0ac1f5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0dd6310a9d452c93ecd840d7dbbdf202e7602c25a134746228dc66399618764798891423a29a9c740c0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1ef557e7b623ea9a0ab3d65fd175768e5c84aff71e4fe204b3a017384a70b37",
-        "network" : "EIP158",
+        "lastblockhash" : "0x224a17aaa8033800f11cc8ade5cce7bffab51226a315f7a647da95972b37a6f8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1f5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte+32_d0g0v0_Frontier" : {
+    "mem64kb_singleByte+32_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/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0x335b4b344a8258c30579e14786132206e2d9cb8b5c11e500f89e37d7895981eb",
-                    "mixHash" : "0x2fec308c31df8e7e60aa3b6c6da31faa1ad18eeb6044a473296cd592bc2c4d45",
-                    "nonce" : "0x04d0a108e1a68568",
+                    "hash" : "0xd05c8a1bd6c0ad05478d700bc1ceaad0d702faab5619a13c94089446f169bc7d",
+                    "mixHash" : "0x4b9c9bb177f02e7b454b4176535d9dc22cbeb8220650446e9adeb608b4f86111",
+                    "nonce" : "0xa421ad91ae646bf4",
                     "number" : "0x01",
                     "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
                     "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a02fec308c31df8e7e60aa3b6c6da31faa1ad18eeb6044a473296cd592bc2c4d458804d0a108e1a68568f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a04b9c9bb177f02e7b454b4176535d9dc22cbeb8220650446e9adeb608b4f8611188a421ad91ae646bf4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x335b4b344a8258c30579e14786132206e2d9cb8b5c11e500f89e37d7895981eb",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd05c8a1bd6c0ad05478d700bc1ceaad0d702faab5619a13c94089446f169bc7d",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte+32_d0g0v0_Homestead" : {
+    "mem64kb_singleByte+32_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/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0xab4300217c2de6cbc4177e23c6679d8d09e8dd0962047bde5b5fe9e959ebe3a4",
-                    "mixHash" : "0x06d2ee89fd44a85b46cf525dfd5c2b2266148a0b33be964fbd8197fe8b62c50e",
-                    "nonce" : "0xad3933b1b4948e0c",
+                    "hash" : "0x9be90dcc46c5d9900224a23752302802ef748d0111beed3a52c647406e380a4b",
+                    "mixHash" : "0x36eff1195ca552b90e1b00f198ba5df18437dce9229a45ade43f1dad232776a9",
+                    "nonce" : "0xb185a5ec3f9127b6",
                     "number" : "0x01",
                     "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
                     "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a006d2ee89fd44a85b46cf525dfd5c2b2266148a0b33be964fbd8197fe8b62c50e88ad3933b1b4948e0cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a036eff1195ca552b90e1b00f198ba5df18437dce9229a45ade43f1dad232776a988b185a5ec3f9127b6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab4300217c2de6cbc4177e23c6679d8d09e8dd0962047bde5b5fe9e959ebe3a4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9be90dcc46c5d9900224a23752302802ef748d0111beed3a52c647406e380a4b",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte+32_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte+32_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/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd635",
-                    "hash" : "0xd18d9a1d52bf80b7a93a045e3bcee85cfe41a8dd21e00bd8155011a3a7a2720f",
-                    "mixHash" : "0x207a7b11c6498d16c2b82ac53891943f8563721a2a10ade23a5c9cb0ae3403ae",
-                    "nonce" : "0x79a0684ea0e15ca1",
+                    "hash" : "0x46635c48770d80cb845d69c12fcb5b773b381bd147f99a5e6bc794a8fcba3caa",
+                    "mixHash" : "0xd4f959738ba472d434dd0101d8d6045d39e2a7277b8a3f93928ae9d19c136472",
+                    "nonce" : "0x07da5f823a9c887a",
                     "number" : "0x01",
                     "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
-                    "receiptTrie" : "0x7a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945",
-                    "stateRoot" : "0xc4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58d",
+                    "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
+                    "stateRoot" : "0x6afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4440ad10ddd20f55b2ea630b85ebf19f9937c27196ba0d47c173cec428ea58da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa07a8f87eb082b6c3c9be616f1b42e0a8a64e8a2b5dc59ddb4180f78364269f945b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0207a7b11c6498d16c2b82ac53891943f8563721a2a10ade23a5c9cb0ae3403ae8879a0684ea0e15ca1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a0d4f959738ba472d434dd0101d8d6045d39e2a7277b8a3f93928ae9d19c1364728807da5f823a9c887af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd18d9a1d52bf80b7a93a045e3bcee85cfe41a8dd21e00bd8155011a3a7a2720f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x46635c48770d80cb845d69c12fcb5b773b381bd147f99a5e6bc794a8fcba3caa",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa1f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d635",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29c1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa1f5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte+32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte+32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd635",
+                    "hash" : "0xc462ce2b08b6d89bb311104b9bfab574cb68dbbdc8121e11e9dc2623746c97e6",
+                    "mixHash" : "0x6ef46cd04098663c525dd16462abbc69527732ce36dd89ef3dd118978cae981c",
+                    "nonce" : "0x2dfe79f33822e110",
+                    "number" : "0x01",
+                    "parentHash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
+                    "receiptTrie" : "0xe7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531",
+                    "stateRoot" : "0x6afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0aab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06afce41ff9a1d6862e31dccb0477838f845e81305e99a4aa7ea2b99b1c129633a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e7f406a659bf65346d0439b2984601eac9d17751c0843a05ba8bc9d7c3937531b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6358203e880a06ef46cd04098663c525dd16462abbc69527732ce36dd89ef3dd118978cae981c882dfe79f33822e110f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xaab565e76c57f04ab069acc35c434cf54933b09c0dfc16c776adf7d6ab2022eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fb1c7c9e5275872b113bd92b0a79d07d11e9b1421586248b6d387a76a80efba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc462ce2b08b6d89bb311104b9bfab574cb68dbbdc8121e11e9dc2623746c97e6",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa1f5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33_d0g0v0.json
index 0575deb72..98aaf6a40 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte+33_d0g0v0_EIP150" : {
+    "mem64kb_singleByte+33_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/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd640",
-                    "hash" : "0xa2b384a3bf8666b8f2f92ae2e817409bb1db1643451f9d8b4a36650220c4f0ed",
-                    "mixHash" : "0xe323dd903ee8e9536b47ce9fb257959f094db4b524933f050504b85c442f27f2",
-                    "nonce" : "0x31c736ae7843e507",
+                    "hash" : "0x1d89deef6e32dbede95e9b3382c7205b8ebbcb088f30331b643ed4ea114d608d",
+                    "mixHash" : "0x2d08524ffea37b52d6e1896016b1b7d4b32ba862a6df236a49317ea029082938",
+                    "nonce" : "0x505ccd18ec3ff6b2",
                     "number" : "0x01",
                     "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
-                    "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
-                    "stateRoot" : "0x12742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317",
+                    "receiptTrie" : "0xe69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2e",
+                    "stateRoot" : "0x3d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a0e323dd903ee8e9536b47ce9fb257959f094db4b524933f050504b85c442f27f28831c736ae7843e507f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a02d08524ffea37b52d6e1896016b1b7d4b32ba862a6df236a49317ea02908293888505ccd18ec3ff6b2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2b384a3bf8666b8f2f92ae2e817409bb1db1643451f9d8b4a36650220c4f0ed",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1d89deef6e32dbede95e9b3382c7205b8ebbcb088f30331b643ed4ea114d608d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa205359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte+33_d0g0v0_EIP158" : {
+    "mem64kb_singleByte+33_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/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd640",
-                    "hash" : "0x1424bbb7fb69614e09d50c8b4fc763e97362ba7a834d44c8d1cb79458a2cbb5d",
-                    "mixHash" : "0xd7df771057b938f91c5280e94bc43cc55148aed6593aa4e394ee602285e13d27",
-                    "nonce" : "0x89f703784b9c4939",
+                    "hash" : "0xa97067d23e24dd762d29a053ba9f5213e6dbb87015597fb101264e3b8fb04af3",
+                    "mixHash" : "0x9650756e1af735a1ce119e7a5f2e2591e1956962d21dabd18df5e3195840091d",
+                    "nonce" : "0x5a622978b7314d1d",
                     "number" : "0x01",
                     "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
-                    "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
-                    "stateRoot" : "0x12742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317",
+                    "receiptTrie" : "0xe69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2e",
+                    "stateRoot" : "0x3d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a0d7df771057b938f91c5280e94bc43cc55148aed6593aa4e394ee602285e13d278889f703784b9c4939f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a09650756e1af735a1ce119e7a5f2e2591e1956962d21dabd18df5e3195840091d885a622978b7314d1df863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1424bbb7fb69614e09d50c8b4fc763e97362ba7a834d44c8d1cb79458a2cbb5d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa97067d23e24dd762d29a053ba9f5213e6dbb87015597fb101264e3b8fb04af3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa205359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte+33_d0g0v0_Frontier" : {
+    "mem64kb_singleByte+33_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/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd640",
-                    "hash" : "0x18f267473c9cfae190b129485b75f2e59f1cd01e4d7fccf173246125ba62fe51",
-                    "mixHash" : "0xd76030b29a877a2d0a8420adb143789e518ef00dfabb53cf0e7dc04629cee1d5",
-                    "nonce" : "0xe40d0fc47b169ab6",
+                    "hash" : "0x933004578f8dd8da6553f5f4818340e145eaf0e5a239554a7a3a2f8f6479aa2a",
+                    "mixHash" : "0x1c48003c1d1b9ec6de5df4d379d5689bf939fc302fd9e7002b543c29c8dff787",
+                    "nonce" : "0x18c43032225b2e0b",
                     "number" : "0x01",
                     "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
                     "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a0d76030b29a877a2d0a8420adb143789e518ef00dfabb53cf0e7dc04629cee1d588e40d0fc47b169ab6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a01c48003c1d1b9ec6de5df4d379d5689bf939fc302fd9e7002b543c29c8dff7878818c43032225b2e0bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18f267473c9cfae190b129485b75f2e59f1cd01e4d7fccf173246125ba62fe51",
-        "network" : "Frontier",
+        "lastblockhash" : "0x933004578f8dd8da6553f5f4818340e145eaf0e5a239554a7a3a2f8f6479aa2a",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte+33_d0g0v0_Homestead" : {
+    "mem64kb_singleByte+33_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/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd640",
-                    "hash" : "0x2ddb342d55fb0fc8530f6df94d23fe44a39ddd052c616c8466c966cc1f927c74",
-                    "mixHash" : "0x1564d23c7bfc07780c4582598b442758439111232313cdb186f2fc0890708e23",
-                    "nonce" : "0xe82f95970bcf0302",
+                    "hash" : "0x3a8f46eb7628f037aaf37c18ac4b8e67445d066afcf3e957dee8b762aa8b0453",
+                    "mixHash" : "0xbdec2c65fc6655d142b2836bdc6a303d50ec29e5c1b06315f26c847eae51b104",
+                    "nonce" : "0x5a7e15fed61d96f4",
                     "number" : "0x01",
                     "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
                     "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a01564d23c7bfc07780c4582598b442758439111232313cdb186f2fc0890708e2388e82f95970bcf0302f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a0bdec2c65fc6655d142b2836bdc6a303d50ec29e5c1b06315f26c847eae51b104885a7e15fed61d96f4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ddb342d55fb0fc8530f6df94d23fe44a39ddd052c616c8466c966cc1f927c74",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3a8f46eb7628f037aaf37c18ac4b8e67445d066afcf3e957dee8b762aa8b0453",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte+33_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte+33_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/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd640",
-                    "hash" : "0x20f06ba3982942ece0950c365b34b0660aaaab19e8e45b82184969320f949349",
-                    "mixHash" : "0xc1dba6214543789725cd1d98f8119bfa1ebe971e26945d70405d87c658c87d1a",
-                    "nonce" : "0x038f93b143dbdb2e",
+                    "hash" : "0x822a9cfb2a75e73bd30f23291d52067fcbb972c07954a8b5f487fd6dce38f6a7",
+                    "mixHash" : "0x60f034d6ab0e9561e5ec979e9ef9752911dd53820fd3ab5129cb61dc08be7226",
+                    "nonce" : "0x40ddd168eeabfe65",
                     "number" : "0x01",
                     "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
-                    "receiptTrie" : "0xe69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2e",
-                    "stateRoot" : "0x3d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748",
+                    "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
+                    "stateRoot" : "0x12742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d66db37b5371d5046f9cde79954a793b19646593aafc18d832a7582bba7c748a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e69c5869cdd6104108392827d0107e390cb3b6d7ef3af9541024b09e6c0dfa2eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a0c1dba6214543789725cd1d98f8119bfa1ebe971e26945d70405d87c658c87d1a88038f93b143dbdb2ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a060f034d6ab0e9561e5ec979e9ef9752911dd53820fd3ab5129cb61dc08be72268840ddd168eeabfe65f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20f06ba3982942ece0950c365b34b0660aaaab19e8e45b82184969320f949349",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x822a9cfb2a75e73bd30f23291d52067fcbb972c07954a8b5f487fd6dce38f6a7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61fa205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa40"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d640",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61fa205359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte+33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte+33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd640",
+                    "hash" : "0xc191d033333b2215160197bdeab422624c9b5529468650c88febef6e2a372e6f",
+                    "mixHash" : "0x16aaf9d7bb4e7337625ebc84c270532bc0a910bed5277061da5f3ce68b07d984",
+                    "nonce" : "0xd2372a33717cd3a9",
+                    "number" : "0x01",
+                    "parentHash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
+                    "receiptTrie" : "0xdfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06",
+                    "stateRoot" : "0x12742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0f54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012742fa6810dcef509032e3531a47061ff6d475d16025d4ae54807be8b68c317a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0dfb5b5d0b3a452158402053e0c1d44fee2c69d1899caf74b731047945ccb2d06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d6408203e880a016aaf9d7bb4e7337625ebc84c270532bc0a910bed5277061da5f3ce68b07d98488d2372a33717cd3a9f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xf54d61372cf9167cb52a4231584dd786a0cdee6a425db4535f5d8d9a3c1a4152",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f351e67fc6a52c223012a152c1e2853487bebe7de578320ae4143817406ee5c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc191d033333b2215160197bdeab422624c9b5529468650c88febef6e2a372e6f",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61fa205359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1_d0g0v0.json
index caf085ebc..cb97a4838 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte-1_d0g0v0_EIP150" : {
+    "mem64kb_singleByte-1_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/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xf3ea3c9276425f6311ce5625481e9a1e33ac2369aeb018b10915345d002cc590",
-                    "mixHash" : "0x5e8562064f8f5ee464042655cd56974c1fd997c30804ab720dfbe575377c2130",
-                    "nonce" : "0xed3f36b19be5d442",
+                    "hash" : "0x84810b47842b93aefcad011a7c81a83654261ecc88e86f0cda2d1d8458677b8a",
+                    "mixHash" : "0x4e6cf492684eb6f962a176ec4a39861b2d5ab95653a7b8a184774c34bc68d2e4",
+                    "nonce" : "0x2092deb1663e5b6a",
                     "number" : "0x01",
                     "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
-                    "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
-                    "stateRoot" : "0xb38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0xbe2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a05e8562064f8f5ee464042655cd56974c1fd997c30804ab720dfbe575377c213088ed3f36b19be5d442f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bfa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a04e6cf492684eb6f962a176ec4a39861b2d5ab95653a7b8a184774c34bc68d2e4882092deb1663e5b6af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3ea3c9276425f6311ce5625481e9a1e33ac2369aeb018b10915345d002cc590",
-        "network" : "EIP150",
+        "lastblockhash" : "0x84810b47842b93aefcad011a7c81a83654261ecc88e86f0cda2d1d8458677b8a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9fe5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte-1_d0g0v0_EIP158" : {
+    "mem64kb_singleByte-1_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/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x295502bb0f408720b5227c432ae3d3de97d587e17cd995a2f60e8a73e22f2218",
-                    "mixHash" : "0x4dec7291010af7a059a2972a97f002f17babbf54530d4823555702c72aa0c716",
-                    "nonce" : "0x63a6fe2f1e1cabc0",
+                    "hash" : "0x98dfbe223843f4074601429eb0e0828f09edf28a3ec16a540d15ace6499f3f18",
+                    "mixHash" : "0x1dba77ad75e0ac567e35cf50fdabefaaca7afd4e68ba3759c5e604e5716c532f",
+                    "nonce" : "0x2de150bc1ace1899",
                     "number" : "0x01",
                     "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
-                    "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
-                    "stateRoot" : "0xb38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0xbe2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a04dec7291010af7a059a2972a97f002f17babbf54530d4823555702c72aa0c7168863a6fe2f1e1cabc0f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bfa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a01dba77ad75e0ac567e35cf50fdabefaaca7afd4e68ba3759c5e604e5716c532f882de150bc1ace1899f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x295502bb0f408720b5227c432ae3d3de97d587e17cd995a2f60e8a73e22f2218",
-        "network" : "EIP158",
+        "lastblockhash" : "0x98dfbe223843f4074601429eb0e0828f09edf28a3ec16a540d15ace6499f3f18",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9fe5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte-1_d0g0v0_Frontier" : {
+    "mem64kb_singleByte-1_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/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xb74949bc2641698e0c24caf6d31f6ed340a981ac3df5647271c502d91c763083",
-                    "mixHash" : "0xb0e3b0b2663562579cab1164b13692bba96897e800ddc7f17bbe1627d2c28fa7",
-                    "nonce" : "0xc976934a3cc9d85f",
+                    "hash" : "0x370ea4fedbc8479d4c70f23e0ddf896a06d124e77bc0218974033dac3b1e5162",
+                    "mixHash" : "0xad0b9516935836bba440113ee8730b9de3ddfd27ade784d5bae622084a68989c",
+                    "nonce" : "0x39d18cb4a0de4ee3",
                     "number" : "0x01",
                     "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
                     "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0b0e3b0b2663562579cab1164b13692bba96897e800ddc7f17bbe1627d2c28fa788c976934a3cc9d85ff863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0ad0b9516935836bba440113ee8730b9de3ddfd27ade784d5bae622084a68989c8839d18cb4a0de4ee3f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb74949bc2641698e0c24caf6d31f6ed340a981ac3df5647271c502d91c763083",
-        "network" : "Frontier",
+        "lastblockhash" : "0x370ea4fedbc8479d4c70f23e0ddf896a06d124e77bc0218974033dac3b1e5162",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte-1_d0g0v0_Homestead" : {
+    "mem64kb_singleByte-1_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/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xcc596659c507a3263743f14c9a6341a02c58114ddd58291a246dad0f4fff4163",
-                    "mixHash" : "0x977ce9f9da83d01aaca0a3468fe13b83e870ec829aecc362d4e866c623832064",
-                    "nonce" : "0xdb4687487f9cc846",
+                    "hash" : "0xa8e68a720f3a5e333d4e1c5c36f43ce3189c280f0dd6484b19885be6537a2181",
+                    "mixHash" : "0xa1fa5c5548e6f8d5cd138873be3d99992cd58a11578be67391f46259539aea55",
+                    "nonce" : "0x854c533f686161e1",
                     "number" : "0x01",
                     "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
                     "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0977ce9f9da83d01aaca0a3468fe13b83e870ec829aecc362d4e866c62383206488db4687487f9cc846f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0a1fa5c5548e6f8d5cd138873be3d99992cd58a11578be67391f46259539aea5588854c533f686161e1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc596659c507a3263743f14c9a6341a02c58114ddd58291a246dad0f4fff4163",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa8e68a720f3a5e333d4e1c5c36f43ce3189c280f0dd6484b19885be6537a2181",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte-1_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte-1_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/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xdb105115e8569ffcec4601bf7f3c82fb950c5009dd8df27e758a48ed1b2d2ea9",
-                    "mixHash" : "0x206316baa1b431d29e44c783cc2e8c060cd9d988e1763c5bd2e7851fa69457f1",
-                    "nonce" : "0x4e1916156874ca00",
+                    "hash" : "0xa19b0cf492a1834f4fb1498ce6138c2a03abf3637167c59bc7d4cbf6e753188a",
+                    "mixHash" : "0x14bfec948b0fd48dbbf519756afa3aeb894f6c891d1b565a8e494ce25f0f1c9d",
+                    "nonce" : "0x54a206dc9bbdcc1e",
                     "number" : "0x01",
                     "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
-                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
-                    "stateRoot" : "0xbe2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bf",
+                    "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
+                    "stateRoot" : "0xb38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be2a069f1cb24ceeabd1d0f75d77d25fe879f85fd1dc94031f94e7bf22d327bfa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0206316baa1b431d29e44c783cc2e8c060cd9d988e1763c5bd2e7851fa69457f1884e1916156874ca00f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a014bfec948b0fd48dbbf519756afa3aeb894f6c891d1b565a8e494ce25f0f1c9d8854a206dc9bbdcc1ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb105115e8569ffcec4601bf7f3c82fb950c5009dd8df27e758a48ed1b2d2ea9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa19b0cf492a1834f4fb1498ce6138c2a03abf3637167c59bc7d4cbf6e753188a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9fe5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d62a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29cc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9fe5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte-1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte-1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd62a",
+                    "hash" : "0xc966f911822d39cd17d7708f465d77498e1605eadd276c075dbd8c89df5edd29",
+                    "mixHash" : "0x6425496879f9f0a9a18c767c43dc227ff73f74ac2ec11bca723d96dfb2ac5c1c",
+                    "nonce" : "0xdc63a72fcf740fe6",
+                    "number" : "0x01",
+                    "parentHash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
+                    "receiptTrie" : "0x0c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7",
+                    "stateRoot" : "0xb38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b38b45a303183682fb8474d268f4682c4c1e36ae543f24e0cef100dbc02aa605a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa00c6f31d6b362b680163c82e189403e31323835fc34758c79863e35e4a4996af7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a06425496879f9f0a9a18c767c43dc227ff73f74ac2ec11bca723d96dfb2ac5c1c88dc63a72fcf740fe6f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x326715a663a9aa6e978f2702c2b48e8efd5b73dbab2ab08cb735c5a6f3be5367",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe4e9ae44efecc627d15e738e680e17e0ea411ee75a06bf60b39035ce5afefcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc966f911822d39cd17d7708f465d77498e1605eadd276c075dbd8c89df5edd29",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9fe5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31_d0g0v0.json
index 8c8ba490c..1b04b59cf 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte-31_d0g0v0_EIP150" : {
+    "mem64kb_singleByte-31_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/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x125735155f5b2c72ae8181ce60744a87349619a911a4afbe19c738cb319ab2ef",
-                    "mixHash" : "0x0009ad7c3e1cdf669441ce91fe2bce9050ab59dada4bbd87bd351324fc73ebbd",
-                    "nonce" : "0xc97707c61b96c718",
+                    "hash" : "0x5f2d5c8df94865db302c8b2dfb2b56f4a7a21415e5b5799dbf0060dfc1a2b130",
+                    "mixHash" : "0x4330711a8dde55a12fd2677579e6299421f0959d0a46988206385a244e2dcf6b",
+                    "nonce" : "0x3894a9fee38acc92",
                     "number" : "0x01",
                     "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
-                    "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
-                    "stateRoot" : "0x750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499e",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0x8447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a00009ad7c3e1cdf669441ce91fe2bce9050ab59dada4bbd87bd351324fc73ebbd88c97707c61b96c718f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a04330711a8dde55a12fd2677579e6299421f0959d0a46988206385a244e2dcf6b883894a9fee38acc92f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x125735155f5b2c72ae8181ce60744a87349619a911a4afbe19c738cb319ab2ef",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5f2d5c8df94865db302c8b2dfb2b56f4a7a21415e5b5799dbf0060dfc1a2b130",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte-31_d0g0v0_EIP158" : {
+    "mem64kb_singleByte-31_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/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x5fcc0f3af52eddd87b8118224290bb53cea39e35c2f387df5fe1c4771e77ac5b",
-                    "mixHash" : "0x35895f228aa50bba4e660fc2d43f9fca215907b160d65e73b35d01c9ae5d3443",
-                    "nonce" : "0xbcb06cf51478c688",
+                    "hash" : "0xd9ab68a327216e27f350976fd35d926a1550b9c43ef99c7c8c007e5cae458f34",
+                    "mixHash" : "0x18f5220d2989059d4a2a78778bc678eb56e9c5fa5717717600b4cc055943cc2c",
+                    "nonce" : "0xea89b95b83bcba46",
                     "number" : "0x01",
                     "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
-                    "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
-                    "stateRoot" : "0x750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499e",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0x8447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a035895f228aa50bba4e660fc2d43f9fca215907b160d65e73b35d01c9ae5d344388bcb06cf51478c688f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a018f5220d2989059d4a2a78778bc678eb56e9c5fa5717717600b4cc055943cc2c88ea89b95b83bcba46f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fcc0f3af52eddd87b8118224290bb53cea39e35c2f387df5fe1c4771e77ac5b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd9ab68a327216e27f350976fd35d926a1550b9c43ef99c7c8c007e5cae458f34",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte-31_d0g0v0_Frontier" : {
+    "mem64kb_singleByte-31_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/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xb53fdb9d7bd5b819768087705fa8d367613d6b38488987ddc44cae1324105564",
-                    "mixHash" : "0xe09aaa92c4c084177c9f94175f595c24615947d7f741c21ba4c7f6177dfaa3ea",
-                    "nonce" : "0x609bb38f907c49c5",
+                    "hash" : "0xbfb3ed7433bf67d44b0b1d1e87e768a251d83cbc6ad8cd35f0e1f2aba67047a6",
+                    "mixHash" : "0x59bdc40c980b703333b918e7568cae12e92baa9a60b46829b6c7d0cd14d9e5e4",
+                    "nonce" : "0x3272bdfeef655f81",
                     "number" : "0x01",
                     "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
                     "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0e09aaa92c4c084177c9f94175f595c24615947d7f741c21ba4c7f6177dfaa3ea88609bb38f907c49c5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a059bdc40c980b703333b918e7568cae12e92baa9a60b46829b6c7d0cd14d9e5e4883272bdfeef655f81f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb53fdb9d7bd5b819768087705fa8d367613d6b38488987ddc44cae1324105564",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbfb3ed7433bf67d44b0b1d1e87e768a251d83cbc6ad8cd35f0e1f2aba67047a6",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte-31_d0g0v0_Homestead" : {
+    "mem64kb_singleByte-31_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/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xa665b0f8214562b5124c7090f47bad3eb519dc1fdfe422fec983b1c8eaeb2d36",
-                    "mixHash" : "0xaf50dfb448af77234140d7a1c38773191914e01570dc55da1f002ef23e062710",
-                    "nonce" : "0x9d340920b7a24260",
+                    "hash" : "0x375b7da0e5364d39d7591bb70ee040956395235e11fad284346ac457e6f1d2e0",
+                    "mixHash" : "0x1b0715cd5f09711035f632f53bed9aa3f2b77df342e283c3ce2a83072b0faa38",
+                    "nonce" : "0x461fbdfb47c09bc1",
                     "number" : "0x01",
                     "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
                     "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0af50dfb448af77234140d7a1c38773191914e01570dc55da1f002ef23e062710889d340920b7a24260f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a01b0715cd5f09711035f632f53bed9aa3f2b77df342e283c3ce2a83072b0faa3888461fbdfb47c09bc1f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa665b0f8214562b5124c7090f47bad3eb519dc1fdfe422fec983b1c8eaeb2d36",
-        "network" : "Homestead",
+        "lastblockhash" : "0x375b7da0e5364d39d7591bb70ee040956395235e11fad284346ac457e6f1d2e0",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte-31_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte-31_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/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xd855edd4afbf5ad4a89ddf313f8c0b135a66de8e98cf4a4ff886041e7ffd1d81",
-                    "mixHash" : "0x2111811e59e85196f2429d48ef8aa57e65b0706a4d962fcfab7e50e0f5f81528",
-                    "nonce" : "0xfd709f837c9618ba",
+                    "hash" : "0x56ad2b137e6ee4f924360f8b24577826d078e594a01c4ac948fedbcbd67ef089",
+                    "mixHash" : "0x5ddee12544fff832b0c051e9b6302c160d26395f9441254aff7032855a7dddbe",
+                    "nonce" : "0x47958c6a6e10dd1a",
                     "number" : "0x01",
                     "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
-                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
-                    "stateRoot" : "0x8447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64d",
+                    "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
+                    "stateRoot" : "0x750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08447ecec0c6cba327379e1739c53336e071f0ac3e4d3407679f7b6af4146a64da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a02111811e59e85196f2429d48ef8aa57e65b0706a4d962fcfab7e50e0f5f8152888fd709f837c9618baf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a05ddee12544fff832b0c051e9b6302c160d26395f9441254aff7032855a7dddbe8847958c6a6e10dd1af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd855edd4afbf5ad4a89ddf313f8c0b135a66de8e98cf4a4ff886041e7ffd1d81",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x56ad2b137e6ee4f924360f8b24577826d078e594a01c4ac948fedbcbd67ef089",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9e05359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d62a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29cc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9e05359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte-31_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte-31_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd62a",
+                    "hash" : "0x9fe652247c07be8f1b3e2875fd48945a65f513f6bf86a87ffecf69f76ffc97ad",
+                    "mixHash" : "0x090aba76b997e698c82046e92087beb2dd624ceefd52d8c544caeca965bd5aa6",
+                    "nonce" : "0x4eefed99ba691786",
+                    "number" : "0x01",
+                    "parentHash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
+                    "receiptTrie" : "0xac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77ca",
+                    "stateRoot" : "0x750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0750cb4baf89a6c042476bf86a08bed497d1e51911fa9e6426cca19e09206499ea0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0ac8a60a25daf19118e0e184d92011606804681aab1b5af1df0e67992357e77cab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0090aba76b997e698c82046e92087beb2dd624ceefd52d8c544caeca965bd5aa6884eefed99ba691786f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x812138d80a65cfda9cab62b5ed1f9de659899e88d80143046ce7c6dd47b8955b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff99957abade01bda60e16efaf8302c4bc65fdee4495d84c70aad0975f8fd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9fe652247c07be8f1b3e2875fd48945a65f513f6bf86a87ffecf69f76ffc97ad",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32_d0g0v0.json
index f7bf9ebf6..ceadd7b51 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte-32_d0g0v0_EIP150" : {
+    "mem64kb_singleByte-32_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/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0xa18f3b8128fa262cc1d930a8ed642ab752696168614f0b14f6a045c1e60cfc23",
-                    "mixHash" : "0x0e1948cc665edf1f4c82f6489a37344f0ef7f4e35f8059005e8f231bae80812f",
-                    "nonce" : "0xd5fe7ce293acfe27",
+                    "hash" : "0xd70a99444e51ecbf5b75246f264c90c25eba72be7e8af83d21ab513299bfc0e3",
+                    "mixHash" : "0x57f04068200a16f270889ed72d8088cb9f101c4e445c1c405e9c28700caa20df",
+                    "nonce" : "0x473fb2000c506d83",
                     "number" : "0x01",
                     "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
-                    "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
-                    "stateRoot" : "0x5ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5d",
+                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
+                    "stateRoot" : "0x1059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a00e1948cc665edf1f4c82f6489a37344f0ef7f4e35f8059005e8f231bae80812f88d5fe7ce293acfe27f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a057f04068200a16f270889ed72d8088cb9f101c4e445c1c405e9c28700caa20df88473fb2000c506d83f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa18f3b8128fa262cc1d930a8ed642ab752696168614f0b14f6a045c1e60cfc23",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd70a99444e51ecbf5b75246f264c90c25eba72be7e8af83d21ab513299bfc0e3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte-32_d0g0v0_EIP158" : {
+    "mem64kb_singleByte-32_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/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0xb8ba734c9988f9180c7f335184ae076c73788468e433b40cb7cb331788bac5da",
-                    "mixHash" : "0x85659053bba9f17ce6cbf4fb3b01924210a1ff48685a9db24bb5028e2e8ffb05",
-                    "nonce" : "0xc6e2c0004e44ff25",
+                    "hash" : "0x0454b16be06ebc248eee8c9d332b29e3957a4e334ec625e3db89fa4ee22e6e9b",
+                    "mixHash" : "0x5f41e96769d13eb28c6d6e5e2c4ba26dff5e65932832648af99a9ee1c6a94ac9",
+                    "nonce" : "0xbaa47f13c6ab8656",
                     "number" : "0x01",
                     "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
-                    "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
-                    "stateRoot" : "0x5ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5d",
+                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
+                    "stateRoot" : "0x1059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a085659053bba9f17ce6cbf4fb3b01924210a1ff48685a9db24bb5028e2e8ffb0588c6e2c0004e44ff25f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a05f41e96769d13eb28c6d6e5e2c4ba26dff5e65932832648af99a9ee1c6a94ac988baa47f13c6ab8656f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8ba734c9988f9180c7f335184ae076c73788468e433b40cb7cb331788bac5da",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0454b16be06ebc248eee8c9d332b29e3957a4e334ec625e3db89fa4ee22e6e9b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte-32_d0g0v0_Frontier" : {
+    "mem64kb_singleByte-32_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/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x119514590d5a513f4a2f00e39c1a2a36e2d175a1b66849fd88ebe8513d7fcf46",
-                    "mixHash" : "0x955dc3ab633ce51b35a4071a240be72c84c92f86fca9de71d7fdab3b03337f51",
-                    "nonce" : "0x6543df9474c048fe",
+                    "hash" : "0x84702737a99116bedac37778af03837c510d1f39e426b12a8131fa4a7d47912f",
+                    "mixHash" : "0xc7ccc52295f8578c9ed1f59fe8ce797f7f3b38f1d998fcc16b796b64b0d67fa7",
+                    "nonce" : "0x29a2cd70e33d2e20",
                     "number" : "0x01",
                     "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
                     "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0955dc3ab633ce51b35a4071a240be72c84c92f86fca9de71d7fdab3b03337f51886543df9474c048fef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0c7ccc52295f8578c9ed1f59fe8ce797f7f3b38f1d998fcc16b796b64b0d67fa78829a2cd70e33d2e20f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x119514590d5a513f4a2f00e39c1a2a36e2d175a1b66849fd88ebe8513d7fcf46",
-        "network" : "Frontier",
+        "lastblockhash" : "0x84702737a99116bedac37778af03837c510d1f39e426b12a8131fa4a7d47912f",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte-32_d0g0v0_Homestead" : {
+    "mem64kb_singleByte-32_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/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x18618a94ddff2678bc3518579ecebace38c1ce7e7a7d528327236b16d251faea",
-                    "mixHash" : "0xafa99185ebbce0a42eed122658dbe3e47f2901af87aafa210892698ae6194a9d",
-                    "nonce" : "0x55c7183cfa82b6e4",
+                    "hash" : "0x73a36a9c98098408e16e662d6fe3e3cd26f14646d5846ec1843907236d3f9a76",
+                    "mixHash" : "0x532c4c55d380b91eac2c42503691c045bd8c554c75af78e4b2049925709887ee",
+                    "nonce" : "0x0ec8dde33748569a",
                     "number" : "0x01",
                     "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
                     "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0afa99185ebbce0a42eed122658dbe3e47f2901af87aafa210892698ae6194a9d8855c7183cfa82b6e4f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0532c4c55d380b91eac2c42503691c045bd8c554c75af78e4b2049925709887ee880ec8dde33748569af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18618a94ddff2678bc3518579ecebace38c1ce7e7a7d528327236b16d251faea",
-        "network" : "Homestead",
+        "lastblockhash" : "0x73a36a9c98098408e16e662d6fe3e3cd26f14646d5846ec1843907236d3f9a76",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte-32_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte-32_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/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x4c2cc7ac7be4bff34536b98ce774151028045726f3e6311f232c7c0ace3e2948",
-                    "mixHash" : "0x08d5e3eda2e29bbb64991c13e5d693fc727eb758cd750f5350ed944f56ece77b",
-                    "nonce" : "0xf571ff272fd29104",
+                    "hash" : "0x3c6c18039d617f635e8e46e6175b7cd53ab4688312f3beb54f18d9a25c6ac009",
+                    "mixHash" : "0x8e15a853f76f9fe7ad6a37a57a628d4f3fdae788fd324360b8d4624fdcd604dd",
+                    "nonce" : "0x33ae2d30abe4700b",
                     "number" : "0x01",
                     "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
-                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
-                    "stateRoot" : "0x1059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439",
+                    "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
+                    "stateRoot" : "0x5ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01059fc5f4085872cd6d54b9b27c294021b028d4c7e1f9c84f57f688e0cb0b439a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a008d5e3eda2e29bbb64991c13e5d693fc727eb758cd750f5350ed944f56ece77b88f571ff272fd29104f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a08e15a853f76f9fe7ad6a37a57a628d4f3fdae788fd324360b8d4624fdcd604dd8833ae2d30abe4700bf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c2cc7ac7be4bff34536b98ce774151028045726f3e6311f232c7c0ace3e2948",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3c6c18039d617f635e8e46e6175b7cd53ab4688312f3beb54f18d9a25c6ac009",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9df5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf9e0"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d61f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29d7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9df5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte-32_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte-32_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd61f",
+                    "hash" : "0x115d33fb8f8ad7af7bd34ec8a63fa4e6a43f267cf129baa5d09cc287c629c564",
+                    "mixHash" : "0x8a3ff56cee8e5b11f1a3a2dba8461e9a547c795cd85624dc8a1f048c253af1a9",
+                    "nonce" : "0x1d404ae827d4f514",
+                    "number" : "0x01",
+                    "parentHash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
+                    "receiptTrie" : "0x792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359",
+                    "stateRoot" : "0x5ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ec05a3968fdca009100a4f9a2759b8c93457e7b0cbda15916f1bf0c4030bb5da0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0792df24970c5565af26aa6e48587f123d723a3f40a99b3d1981a86e4689ca359b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a08a3ff56cee8e5b11f1a3a2dba8461e9a547c795cd85624dc8a1f048c253af1a9881d404ae827d4f514f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x561d0247bc2e8150a2a8117932d3e8e2ffa31c8f0a9ee780fa1090091902dd19",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971735b473b9fe5a2429a20b4aff37021e6960a8376fb2c1f1f0b76f55a12c43a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x115d33fb8f8ad7af7bd34ec8a63fa4e6a43f267cf129baa5d09cc287c629c564",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9df5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33_d0g0v0.json
index 45ef8273e..25f229fbb 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte-33_d0g0v0_EIP150" : {
+    "mem64kb_singleByte-33_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/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x3fb2b27799dc2414377bc6cca8b6b326889f208797ad2f6d2a0f4a447569ca46",
-                    "mixHash" : "0x3d92500b3ae1256c4eb0d55e806f91c720241e2b5c535655e26f668b3d3c77d1",
-                    "nonce" : "0x14a15024afe40f11",
+                    "hash" : "0x1a05ba83f287dd530aaccfa7a58654380f42c1604127ec081e42c16c1bf94515",
+                    "mixHash" : "0x758fac115f42749a4f76ce4a46b7905a7613ad4875b0534162723474dc3c8336",
+                    "nonce" : "0x818d500a27f85b8c",
                     "number" : "0x01",
                     "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
-                    "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
-                    "stateRoot" : "0x6ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbc",
+                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
+                    "stateRoot" : "0xd5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a03d92500b3ae1256c4eb0d55e806f91c720241e2b5c535655e26f668b3d3c77d18814a15024afe40f11f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0758fac115f42749a4f76ce4a46b7905a7613ad4875b0534162723474dc3c833688818d500a27f85b8cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fb2b27799dc2414377bc6cca8b6b326889f208797ad2f6d2a0f4a447569ca46",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1a05ba83f287dd530aaccfa7a58654380f42c1604127ec081e42c16c1bf94515",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9de5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte-33_d0g0v0_EIP158" : {
+    "mem64kb_singleByte-33_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/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x6c436273e63f7f2e82d793348418b46b9edd9f2cefc38fac01378434f2bfaf48",
-                    "mixHash" : "0x4e654e04c1e8ded3be30423972523233f7ae8e1eb5bcb5cd0020bc2e32d6dace",
-                    "nonce" : "0x5a741ce2d0af766c",
+                    "hash" : "0x62dd3237e1c43b9a81793939029c6779d846ca0a93cd4751003258b0ddae1161",
+                    "mixHash" : "0x0762bed809420d4dba451b8530521a202388d12d357a43924b80e4438ea7f9eb",
+                    "nonce" : "0x150261051952aeb2",
                     "number" : "0x01",
                     "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
-                    "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
-                    "stateRoot" : "0x6ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbc",
+                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
+                    "stateRoot" : "0xd5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a04e654e04c1e8ded3be30423972523233f7ae8e1eb5bcb5cd0020bc2e32d6dace885a741ce2d0af766cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a00762bed809420d4dba451b8530521a202388d12d357a43924b80e4438ea7f9eb88150261051952aeb2f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c436273e63f7f2e82d793348418b46b9edd9f2cefc38fac01378434f2bfaf48",
-        "network" : "EIP158",
+        "lastblockhash" : "0x62dd3237e1c43b9a81793939029c6779d846ca0a93cd4751003258b0ddae1161",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9de5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte-33_d0g0v0_Frontier" : {
+    "mem64kb_singleByte-33_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/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0xfb77d45f79c813256b3521209cc17cf1e75477f058ad5da49d88e03f2533293f",
-                    "mixHash" : "0x0f5cc84469773d8f7be7ea893e4d43453774dbee8c2d6eb82b0952177a798535",
-                    "nonce" : "0xbf7127d22071ed49",
+                    "hash" : "0x609b3db37910587c9245ca6ec53c9c86223659781010c97d0a5abebe1540c8b4",
+                    "mixHash" : "0x8ff6996c622ee021831ef8fa42103d4f32ea8747131195a06b4746fb7bfc5b99",
+                    "nonce" : "0xa03d443810c57655",
                     "number" : "0x01",
                     "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
                     "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a00f5cc84469773d8f7be7ea893e4d43453774dbee8c2d6eb82b0952177a79853588bf7127d22071ed49f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a08ff6996c622ee021831ef8fa42103d4f32ea8747131195a06b4746fb7bfc5b9988a03d443810c57655f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb77d45f79c813256b3521209cc17cf1e75477f058ad5da49d88e03f2533293f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x609b3db37910587c9245ca6ec53c9c86223659781010c97d0a5abebe1540c8b4",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte-33_d0g0v0_Homestead" : {
+    "mem64kb_singleByte-33_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/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0xa61370833068b61dc5235f0f8e4853dfce82e59e262eace7437cbc5ab4c7c1e3",
-                    "mixHash" : "0x62df51e43607b1c188609825658854eadfe04c19e5fbd844ffb508fcfdc86247",
-                    "nonce" : "0x88d24c6b0c0e1b79",
+                    "hash" : "0xeeba3065c72dc615a23be459092752b25e9e44f1067dcb0ceea9d31cdf92de16",
+                    "mixHash" : "0x70028ad2b2e28f0bf2939c94a4637cc238f716e673ddd7cf8ebc61cb9c977185",
+                    "nonce" : "0xf1ecce35d39bb6eb",
                     "number" : "0x01",
                     "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
                     "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a062df51e43607b1c188609825658854eadfe04c19e5fbd844ffb508fcfdc862478888d24c6b0c0e1b79f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a070028ad2b2e28f0bf2939c94a4637cc238f716e673ddd7cf8ebc61cb9c97718588f1ecce35d39bb6ebf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa61370833068b61dc5235f0f8e4853dfce82e59e262eace7437cbc5ab4c7c1e3",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeeba3065c72dc615a23be459092752b25e9e44f1067dcb0ceea9d31cdf92de16",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte-33_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte-33_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/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd61f",
-                    "hash" : "0x597a5e4bff952c5ffe243421f516cd55593c7e67569b604d236546a959968b09",
-                    "mixHash" : "0xfba9ec8899adb5d4db3753ab8c3221cb3693612210b2010c9994672815455839",
-                    "nonce" : "0x62996070d30d6873",
+                    "hash" : "0x014b9077bdf049c92a4c7c4c418afb7f2ed67802bc3e9c1f25d9584f69591b27",
+                    "mixHash" : "0x6cf72175d209dcd55f84bd3520b4791720d9fcf808b9446c78d6db22d63fa6fa",
+                    "nonce" : "0x5f007b330822ad7a",
                     "number" : "0x01",
                     "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
-                    "receiptTrie" : "0x77a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6",
-                    "stateRoot" : "0xd5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7",
+                    "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
+                    "stateRoot" : "0x6ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5912095088496ba9f7c079b38c7121edfaf9adea64bee9003450a68c06bead7a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa077a8ffb2f51941dbec220f4db612d9a0fde13f37207f9c09eb755c1dcedafbe6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0fba9ec8899adb5d4db3753ab8c3221cb3693612210b2010c99946728154558398862996070d30d6873f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a06cf72175d209dcd55f84bd3520b4791720d9fcf808b9446c78d6db22d63fa6fa885f007b330822ad7af863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x597a5e4bff952c5ffe243421f516cd55593c7e67569b604d236546a959968b09",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x014b9077bdf049c92a4c7c4c418afb7f2ed67802bc3e9c1f25d9584f69591b27",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9de5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf9e0"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d61f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29d7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9de5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte-33_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte-33_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd61f",
+                    "hash" : "0x0bd7ec4707d57552dc10a8bb1fb0816c1943f0fdd09b446cb35eff7eb41efba4",
+                    "mixHash" : "0xc340390ac0a336f42934086967b333fbc010491744d58ab6d2b65d759a4cac6e",
+                    "nonce" : "0x875b7e83bf05a002",
+                    "number" : "0x01",
+                    "parentHash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
+                    "receiptTrie" : "0xb05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404",
+                    "stateRoot" : "0x6ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce4e1df43467d063adf3957edc0b76070630b496602608a6ba35b7e89e2afbca0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0b05d66d9ad4ed8a9910ab5150341ed45e083688aec1cbcf1e25ce69d661ba404b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d61f8203e880a0c340390ac0a336f42934086967b333fbc010491744d58ab6d2b65d759a4cac6e88875b7e83bf05a002f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x676e13181ac562daff3e165b96db6ef762296ca7f253c9ba76e865c75a022d00",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fef96ce86f5f67d00fc0261fb5f56d01ab8c9fe110ec8719c35b1e7b5838a69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0bd7ec4707d57552dc10a8bb1fb0816c1943f0fdd09b446cb35eff7eb41efba4",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9de5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte_d0g0v0.json
index 4e2cd669d..53b927344 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_singleByte_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_singleByte_d0g0v0_EIP150" : {
+    "mem64kb_singleByte_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/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xab3feff3f1db29dd7e92b8b71d9d6e06a2bcf98fa653e2d9ff6802b6caff39f5",
-                    "mixHash" : "0x4d64749b34739f8696109fc0cb2e13169d77a419d1404571d5a8835e49427af9",
-                    "nonce" : "0xfc7d711984e7e852",
+                    "hash" : "0x1d6e3341b321f4079e5dab0420aa65e6a2e634ff23c9b9f5acbd13ca10f455b9",
+                    "mixHash" : "0x1c5e59e361cbe550ec07fc275586bdd324bc78331d7871ad36fa7b7c02b9200a",
+                    "nonce" : "0xff03d5ee428ae648",
                     "number" : "0x01",
                     "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
-                    "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
-                    "stateRoot" : "0x2a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0x387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a04d64749b34739f8696109fc0cb2e13169d77a419d1404571d5a8835e49427af988fc7d711984e7e852f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a01c5e59e361cbe550ec07fc275586bdd324bc78331d7871ad36fa7b7c02b9200a88ff03d5ee428ae648f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab3feff3f1db29dd7e92b8b71d9d6e06a2bcf98fa653e2d9ff6802b6caff39f5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1d6e3341b321f4079e5dab0420aa65e6a2e634ff23c9b9f5acbd13ca10f455b9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5359600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "mem64kb_singleByte_d0g0v0_EIP158" : {
+    "mem64kb_singleByte_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/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x550a642cfb95821376e34c48464c9ff6ea29fa396ade329e360e1a4a9182cc1c",
-                    "mixHash" : "0xf1fd7d7cde265a0ea6592e93e3d45445c53b917587de9520a841579b2a9864eb",
-                    "nonce" : "0xf1d9e2a4310a6d1e",
+                    "hash" : "0xc52fbba434c5c714e0e6996fab1cc93bdeba60067882ae8a9314f15199e0e097",
+                    "mixHash" : "0x1b38476fe072a88e5b627befc09b880ed8470732b52670e6f38d8df5a8d6b343",
+                    "nonce" : "0x6b6efbf7dec3a949",
                     "number" : "0x01",
                     "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
-                    "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
-                    "stateRoot" : "0x2a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223",
+                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
+                    "stateRoot" : "0x387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0f1fd7d7cde265a0ea6592e93e3d45445c53b917587de9520a841579b2a9864eb88f1d9e2a4310a6d1ef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a01b38476fe072a88e5b627befc09b880ed8470732b52670e6f38d8df5a8d6b343886b6efbf7dec3a949f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x550a642cfb95821376e34c48464c9ff6ea29fa396ade329e360e1a4a9182cc1c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc52fbba434c5c714e0e6996fab1cc93bdeba60067882ae8a9314f15199e0e097",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5359600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "mem64kb_singleByte_d0g0v0_Frontier" : {
+    "mem64kb_singleByte_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/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x37bc6896828ee9ba070529cbcde04dc8ed51d1d88452831d64dd0a5758ba654e",
-                    "mixHash" : "0x1424ceef21d6ca73714e451c4f18b43fb5c621f677e7322f00b89201042fd1aa",
-                    "nonce" : "0x891b4a1fa4ebcace",
+                    "hash" : "0xe4c1ddb11ebfd31534fd1b7d884931539ec1749f7708db290dedf393d221a1da",
+                    "mixHash" : "0x613c6d35f32388976826fd06d4d85f95cbc062861f166f3eace6045eeb8ae642",
+                    "nonce" : "0x6c1bf4af368876b5",
                     "number" : "0x01",
                     "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
                     "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a01424ceef21d6ca73714e451c4f18b43fb5c621f677e7322f00b89201042fd1aa88891b4a1fa4ebcacef863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0613c6d35f32388976826fd06d4d85f95cbc062861f166f3eace6045eeb8ae642886c1bf4af368876b5f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37bc6896828ee9ba070529cbcde04dc8ed51d1d88452831d64dd0a5758ba654e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe4c1ddb11ebfd31534fd1b7d884931539ec1749f7708db290dedf393d221a1da",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "mem64kb_singleByte_d0g0v0_Homestead" : {
+    "mem64kb_singleByte_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/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0xecad3c77fc6a0af7f650fe2796aa6ad7002118766282a955684bb9939f4b91d5",
-                    "mixHash" : "0x58af415e078797222573fb0f0d54febeeb7c2e1c73b4905eea4fb9549fde09bf",
-                    "nonce" : "0x82da4924d7e39aeb",
+                    "hash" : "0xbfc9b3fbeeb635e71f9efc35a3a7a1e5f418dd49a55b70ee8d9f98eeb22aea20",
+                    "mixHash" : "0x6335b40118d7cce21a51bdc10c0147e6533fb780a9ef514c5ae64e93bf67396a",
+                    "nonce" : "0x55e838c813e35b90",
                     "number" : "0x01",
                     "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
                     "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a058af415e078797222573fb0f0d54febeeb7c2e1c73b4905eea4fb9549fde09bf8882da4924d7e39aebf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a06335b40118d7cce21a51bdc10c0147e6533fb780a9ef514c5ae64e93bf67396a8855e838c813e35b90f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecad3c77fc6a0af7f650fe2796aa6ad7002118766282a955684bb9939f4b91d5",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbfc9b3fbeeb635e71f9efc35a3a7a1e5f418dd49a55b70ee8d9f98eeb22aea20",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "mem64kb_singleByte_d0g0v0_Metropolis" : {
+    "mem64kb_singleByte_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/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xd62a",
-                    "hash" : "0x0178188c001ace6ebe1f563cac88dba0c8fbace1a4da62a6b0d8eb1eddee7f25",
-                    "mixHash" : "0x0621a88381c83a2eb88bbcf1c09620d17064dbdd7a83e43a335ef5873e94241f",
-                    "nonce" : "0xc7a1206bf2485329",
+                    "hash" : "0xb64446e97cf6206b5c88f0f3e54bd36a309fa42042fbacc15d5ddff7ffdb05e7",
+                    "mixHash" : "0xcfe8666216b7746d67f1212ae7653e57bd48b9b0babcadbc4b64f1e7f08383f1",
+                    "nonce" : "0x840b348b4735c96c",
                     "number" : "0x01",
                     "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
-                    "receiptTrie" : "0xe40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12",
-                    "stateRoot" : "0x387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126a",
+                    "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
+                    "stateRoot" : "0x2a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0387ccfc74dad2e2df95f72695a294c1b9f291529dfdd483ea7ba646c478f126aa0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa0e40d25af32d198898889f6eeab7d991156b4b2c8e227d327f4aebc6ec7befe12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a00621a88381c83a2eb88bbcf1c09620d17064dbdd7a83e43a335ef5873e94241f88c7a1206bf2485329f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0cfe8666216b7746d67f1212ae7653e57bd48b9b0babcadbc4b64f1e7f08383f188840b348b4735c96cf863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0178188c001ace6ebe1f563cac88dba0c8fbace1a4da62a6b0d8eb1eddee7f25",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb64446e97cf6206b5c88f0f3e54bd36a309fa42042fbacc15d5ddff7ffdb05e7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9ff5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d62a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff29cc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9ff5359600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_singleByte_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_singleByte_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xd62a",
+                    "hash" : "0x029e13c38c898b8edc64053aadbfe420eecf2e57fbd3fffbf4376cb54d504527",
+                    "mixHash" : "0xab22820b101bf01fdb5d08498257d0dbfc39622f7a4b40c27745c5d2ca8cc608",
+                    "nonce" : "0xa5494ef4664bc535",
+                    "number" : "0x01",
+                    "parentHash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
+                    "receiptTrie" : "0x85318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350",
+                    "stateRoot" : "0x2a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a01f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a7403b6aeac32865d426b3fc751e0255f31c3bcab49aa8f191cf5b5c3549223a0579a1a7e0077c790d96eb12a938445003a0f26110320cb2527921bad5605561aa085318f7170df60e96cbf467556172b5317e19c3ef3433f58dd13af7caa053350b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082d62a8203e880a0ab22820b101bf01fdb5d08498257d0dbfc39622f7a4b40c27745c5d2ca8cc60888a5494ef4664bc535f863f86180018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0c368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7a00534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc368a240875530dbea24d5f971b4ade577a1702ed44b66a0ca6c592986d3d1a7",
+                        "s" : "0x0534768d31a4befd7cee3b7a73775e16bb1d9aca9ef2e8828286a408a0115978",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x1f7ccbbdf755d4b682e49dffd64d5feee851f0c00ff61b811e95924c89e7cd19",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044bed1074c324290ba10a6272e80f79381535950ef3217f359670a3e8cfd4584a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x029e13c38c898b8edc64053aadbfe420eecf2e57fbd3fffbf4376cb54d504527",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9ff5359600055",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/memReturn_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/memReturn_d0g0v0.json
index 77da762b0..e7fe8c7be 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/memReturn_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/memReturn_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "memReturn_d0g0v0_EIP150" : {
+    "memReturn_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/stMemoryTest/memReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x672a",
-                    "hash" : "0x07c8688268ee1d9685da2800441ebc3211f56517a1a50a3cc5e082ec4c130613",
-                    "mixHash" : "0x7d75d69b720b50709c0fae4c3c5be283b991fe84736d23fe8fbfd159b1ca3ba2",
-                    "nonce" : "0x27d38a163654286b",
+                    "hash" : "0x744370f3e2bb855372c5b04a1c8da9b0172ee0ee8aaa9a0a64de65455307eabb",
+                    "mixHash" : "0xb7e3f287c442de5156b1b05c40a805fe8f8f2be86aa63dfef4c3b9d738b9be3c",
+                    "nonce" : "0x3010bef068ae4434",
                     "number" : "0x01",
                     "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
-                    "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
-                    "stateRoot" : "0x41f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85d",
+                    "receiptTrie" : "0x9d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5",
+                    "stateRoot" : "0x616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a07d75d69b720b50709c0fae4c3c5be283b991fe84736d23fe8fbfd159b1ca3ba28827d38a163654286bf8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991a07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca09d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0b7e3f287c442de5156b1b05c40a805fe8f8f2be86aa63dfef4c3b9d738b9be3c883010bef068ae4434f8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
                 "transactions" : [
                     {
                         "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07c8688268ee1d9685da2800441ebc3211f56517a1a50a3cc5e082ec4c130613",
-        "network" : "EIP150",
+        "lastblockhash" : "0x744370f3e2bb855372c5b04a1c8da9b0172ee0ee8aaa9a0a64de65455307eabb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x366000600037596000f3",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "memReturn_d0g0v0_EIP158" : {
+    "memReturn_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/stMemoryTest/memReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x672a",
-                    "hash" : "0x02567380314d142195e507df0c8c5d9e05707fe4b1d5b9ae042eb8ec4c46cc64",
-                    "mixHash" : "0x23c273d3151629b91f26f1bf0129a8b49451c232214316885288f8caff989ffa",
-                    "nonce" : "0xaad53c93db68a251",
+                    "hash" : "0x75ec2b46075fd616112f40fca20a167344a7058d75cc915495d6474ed0397335",
+                    "mixHash" : "0x0839bc0495c23a8680646d48c37ec27f1ab732f86ff26d98a6a325cc10692849",
+                    "nonce" : "0xe56546d787c20bdf",
                     "number" : "0x01",
                     "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
-                    "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
-                    "stateRoot" : "0x41f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85d",
+                    "receiptTrie" : "0x9d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5",
+                    "stateRoot" : "0x616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a023c273d3151629b91f26f1bf0129a8b49451c232214316885288f8caff989ffa88aad53c93db68a251f8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991a07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca09d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a00839bc0495c23a8680646d48c37ec27f1ab732f86ff26d98a6a325cc1069284988e56546d787c20bdff8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
                 "transactions" : [
                     {
                         "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02567380314d142195e507df0c8c5d9e05707fe4b1d5b9ae042eb8ec4c46cc64",
-        "network" : "EIP158",
+        "lastblockhash" : "0x75ec2b46075fd616112f40fca20a167344a7058d75cc915495d6474ed0397335",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x366000600037596000f3",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "memReturn_d0g0v0_Frontier" : {
+    "memReturn_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/stMemoryTest/memReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x672a",
-                    "hash" : "0x18cd2ae62681f10c9d462fa3e74bcc07d47eb598dfa11ec2517cb512a3026929",
-                    "mixHash" : "0xc924c36626f9c0a70cae0528a4c530dec527e731acfcf4357127dd87d6f8659c",
-                    "nonce" : "0x829c750165fe650e",
+                    "hash" : "0x2e4a6e167a5a49d2cb0f5c535975075e2497ff318a59cab8f34a0027cd0429c3",
+                    "mixHash" : "0xff15c4907b3ffc03aacaf43920c0914a9d38c685c58c8b8a308ef5f0f894fd29",
+                    "nonce" : "0x84c8c43fdb7dafbf",
                     "number" : "0x01",
                     "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
                     "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0c924c36626f9c0a70cae0528a4c530dec527e731acfcf4357127dd87d6f8659c88829c750165fe650ef8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0ff15c4907b3ffc03aacaf43920c0914a9d38c685c58c8b8a308ef5f0f894fd298884c8c43fdb7dafbff8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
                 "transactions" : [
                     {
                         "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18cd2ae62681f10c9d462fa3e74bcc07d47eb598dfa11ec2517cb512a3026929",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2e4a6e167a5a49d2cb0f5c535975075e2497ff318a59cab8f34a0027cd0429c3",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "memReturn_d0g0v0_Homestead" : {
+    "memReturn_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/stMemoryTest/memReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x672a",
-                    "hash" : "0x2222dc91ffd097799be84961c96951a152e0de2ac8a3d523d696c7a7078a0b87",
-                    "mixHash" : "0xa58e8311067ffae7ab92af24b26f7d18a37e83ba756aaf4508711b9930bea252",
-                    "nonce" : "0x1d18d5d5e6602177",
+                    "hash" : "0x7f653bc80402cd3a1225da6e9aec4c97bad767c372e79b057859fd4c437a7c82",
+                    "mixHash" : "0xbc93501dda4e72a54ad7e114104a832614ad6aac7054240be2664480679d38e8",
+                    "nonce" : "0x6c5f0a183f89a639",
                     "number" : "0x01",
                     "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
                     "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0a58e8311067ffae7ab92af24b26f7d18a37e83ba756aaf4508711b9930bea252881d18d5d5e6602177f8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0bc93501dda4e72a54ad7e114104a832614ad6aac7054240be2664480679d38e8886c5f0a183f89a639f8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
                 "transactions" : [
                     {
                         "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2222dc91ffd097799be84961c96951a152e0de2ac8a3d523d696c7a7078a0b87",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7f653bc80402cd3a1225da6e9aec4c97bad767c372e79b057859fd4c437a7c82",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "memReturn_d0g0v0_Metropolis" : {
+    "memReturn_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/stMemoryTest/memReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x672a",
-                    "hash" : "0x872e3f4de6c934125b9485c535137ae3ab8482200f789698d351819f9a45afba",
-                    "mixHash" : "0xe0672c7e140573533531f73e856f75ac6bb68a4aeb9f07f0cac10a21fee98fd3",
-                    "nonce" : "0x2ae83d35a851455c",
+                    "hash" : "0x84834054d96dd252124cbf7af945595477dbf6ac71568303fb47b1bf03d9c339",
+                    "mixHash" : "0x2d36cb0252b9d78f29ad4bbb18430a6acec8959d202babd03e4b8d564c3b5dcd",
+                    "nonce" : "0xfd148735060b5a9d",
                     "number" : "0x01",
                     "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
-                    "receiptTrie" : "0x9d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5",
-                    "stateRoot" : "0x616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991",
+                    "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
+                    "stateRoot" : "0x41f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0616772b8ad938c3f39531f0f048223ee00586acd4890f8656b4550b32870c991a07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca09d3607f2edda5281dc2e4b01cac99448e4a68e648e95ce65ac47c5953b013ed5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a0e0672c7e140573533531f73e856f75ac6bb68a4aeb9f07f0cac10a21fee98fd3882ae83d35a851455cf8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a02d36cb0252b9d78f29ad4bbb18430a6acec8959d202babd03e4b8d564c3b5dcd88fd148735060b5a9df8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
                 "transactions" : [
                     {
                         "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x872e3f4de6c934125b9485c535137ae3ab8482200f789698d351819f9a45afba",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x84834054d96dd252124cbf7af945595477dbf6ac71568303fb47b1bf03d9c339",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x366000600037596000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4672a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff98cc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x366000600037596000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "memReturn_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/memReturn_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x672a",
+                    "hash" : "0x35c6f81a2ebb980edc5a8128f8f4d4eb17e9aec76da23dbdba07801ce8a41983",
+                    "mixHash" : "0x18141d660537ebd24fc8f8a8177355a0ea406a53c4d57b8306d1aa6ddb552c1a",
+                    "nonce" : "0xdf1b63675426d64c",
+                    "number" : "0x01",
+                    "parentHash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
+                    "receiptTrie" : "0xa369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0",
+                    "stateRoot" : "0x41f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902b3f901f9a017b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041f40fdbdfacbe8ac681c15ea43521e4828159db3101715e4364eed4f996c85da07c2c2ff999a03364f47da9403ae21285954273fa06a604b519760cfb492dbbdca0a369b2c72ea74b001626203fbccd2d19a7e47edec1e76a962fb5253ff1a191c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082672a8203e880a018141d660537ebd24fc8f8a8177355a0ea406a53c4d57b8306d1aa6ddb552c1a88df1b63675426d64cf8b4f8b280018450001798940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60ab850ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1ca0c97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3a03567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695cc0",
+                "transactions" : [
+                    {
+                        "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                        "gasLimit" : "0x50001798",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc97fbc51eb46135dc23f658b99e2aa35b57de350df049f3d49ec2785931276c3",
+                        "s" : "0x3567534267a408c6c78166636b9f580a3c0bf23d414bcf9348ad184fb242695c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x17b01482025b0404a717878b9a025b61617091047c2ccaf08929533799c82db8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b02b0950cecc0c614f26faef1f0b888af581755d7c073226d7900f9849c5e931a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x35c6f81a2ebb980edc5a8128f8f4d4eb17e9aec76da23dbdba07801ce8a41983",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x366000600037596000f3",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mload16bitBound_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mload16bitBound_d0g0v0.json
index 817292a0f..cc8a61cfa 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mload16bitBound_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mload16bitBound_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mload16bitBound_d0g0v0_EIP150" : {
+    "mload16bitBound_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/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x10000804025c",
                     "gasUsed" : "0x9da4",
-                    "hash" : "0x564829a4b728fc7c01012c80e3335ca10a2226cf351dab9f62266457b377aabd",
-                    "mixHash" : "0x0e509c96fe06c4ef32ad504acfdefe66cae0cd5d2b4299101789c13cab20b899",
-                    "nonce" : "0xd7910796f1ed6b2a",
+                    "hash" : "0x60654cdea9f35fa2edbfe4e1acf43968ef720448328760b940846419db9ff873",
+                    "mixHash" : "0xfe02ac6ba65ad4f607dc132ecf86781d1340789ddaff5d4ee9ffeb45bbdcd542",
+                    "nonce" : "0x393169397e3c08da",
                     "number" : "0x01",
                     "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
-                    "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
-                    "stateRoot" : "0x580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3",
+                    "receiptTrie" : "0xe0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0d",
+                    "stateRoot" : "0x864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a00e509c96fe06c4ef32ad504acfdefe66cae0cd5d2b4299101789c13cab20b89988d7910796f1ed6b2af865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0e0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0fe02ac6ba65ad4f607dc132ecf86781d1340789ddaff5d4ee9ffeb45bbdcd54288393169397e3c08daf865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x564829a4b728fc7c01012c80e3335ca10a2226cf351dab9f62266457b377aabd",
-        "network" : "EIP150",
+        "lastblockhash" : "0x60654cdea9f35fa2edbfe4e1acf43968ef720448328760b940846419db9ff873",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6201000051600155",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "mload16bitBound_d0g0v0_EIP158" : {
+    "mload16bitBound_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/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x10000804025c",
                     "gasUsed" : "0x9da4",
-                    "hash" : "0xd1705c17bdd442168f9032e76c8b74b81f56e1802ac4022e6492e3b186f67df2",
-                    "mixHash" : "0xaf9781f1efe90d22f0e53ef1772b70f75abb59f80fd20e254d0052206e0a75b4",
-                    "nonce" : "0xa94c7156ab1fbe6f",
+                    "hash" : "0x5ed1560e3fa0863ab24010c543d02fe0c1d5dd91107f3d2ed5d9b2b1061c53ee",
+                    "mixHash" : "0x407d9630b4683f06ede3b875b0c95552cd253f481d2a2aa9ea37e077923ae4d1",
+                    "nonce" : "0x3473a38180bdf8a9",
                     "number" : "0x01",
                     "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
-                    "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
-                    "stateRoot" : "0x580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3",
+                    "receiptTrie" : "0xe0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0d",
+                    "stateRoot" : "0x864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0af9781f1efe90d22f0e53ef1772b70f75abb59f80fd20e254d0052206e0a75b488a94c7156ab1fbe6ff865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0e0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0407d9630b4683f06ede3b875b0c95552cd253f481d2a2aa9ea37e077923ae4d1883473a38180bdf8a9f865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1705c17bdd442168f9032e76c8b74b81f56e1802ac4022e6492e3b186f67df2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5ed1560e3fa0863ab24010c543d02fe0c1d5dd91107f3d2ed5d9b2b1061c53ee",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6201000051600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "mload16bitBound_d0g0v0_Frontier" : {
+    "mload16bitBound_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/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x10000804025c",
                     "gasUsed" : "0x9da4",
-                    "hash" : "0x2a617af9bae4b3a9f11d0f64976c604079e8bb8c21bb4e5549ffaeb43d706a83",
-                    "mixHash" : "0xf8c18faf85924f8f292f24d459ec16ea8c6afee2584c54f87f46642cefed8f47",
-                    "nonce" : "0x9375b8556ac8be61",
+                    "hash" : "0x0588a30ed5ee6df25c5e299dfda0efda2ae0cbb1caa6891b567d89d6fdfd16a6",
+                    "mixHash" : "0x407bc605fcf3ae079e0e5fbab4496c5ace3d737e1091a58340a73d68edd810e0",
+                    "nonce" : "0x102f3f3a9988eebe",
                     "number" : "0x01",
                     "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
                     "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0f8c18faf85924f8f292f24d459ec16ea8c6afee2584c54f87f46642cefed8f47889375b8556ac8be61f865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0407bc605fcf3ae079e0e5fbab4496c5ace3d737e1091a58340a73d68edd810e088102f3f3a9988eebef865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a617af9bae4b3a9f11d0f64976c604079e8bb8c21bb4e5549ffaeb43d706a83",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0588a30ed5ee6df25c5e299dfda0efda2ae0cbb1caa6891b567d89d6fdfd16a6",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "mload16bitBound_d0g0v0_Homestead" : {
+    "mload16bitBound_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/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x10000804025c",
                     "gasUsed" : "0x9da4",
-                    "hash" : "0xaf5f41f9095bd7581c2ebd6f36fdca01fc58f3b732fd842944d35f5cde3523e2",
-                    "mixHash" : "0x544aa947a6695bfc961cccf858b54b38e5192c0bb93e42b29fffc551113d8bd5",
-                    "nonce" : "0x4e46e55ac6747252",
+                    "hash" : "0x27e112fcffbc6bcc7c70e10c7e910bde542545d9150eeb9df7e5446fd393dabc",
+                    "mixHash" : "0xf7af0547f4fcb555ed2c443265fc7d1236a5eded505e8e57d9b819407ccd4a22",
+                    "nonce" : "0x5f5ec952e3ef8ce8",
                     "number" : "0x01",
                     "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
                     "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0544aa947a6695bfc961cccf858b54b38e5192c0bb93e42b29fffc551113d8bd5884e46e55ac6747252f865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0f7af0547f4fcb555ed2c443265fc7d1236a5eded505e8e57d9b819407ccd4a22885f5ec952e3ef8ce8f865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf5f41f9095bd7581c2ebd6f36fdca01fc58f3b732fd842944d35f5cde3523e2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x27e112fcffbc6bcc7c70e10c7e910bde542545d9150eeb9df7e5446fd393dabc",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "mload16bitBound_d0g0v0_Metropolis" : {
+    "mload16bitBound_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/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x10000804025c",
                     "gasUsed" : "0x9da4",
-                    "hash" : "0x695179faacda2d06da02f53d8a351198c1f2d2631f8424c86c6aa9bbbc224c15",
-                    "mixHash" : "0xaf586fc2e5c0cb9c51e4cb06c9ad6dcec52a21943d657c9939a51b3988689232",
-                    "nonce" : "0xca8e6da3417bfdee",
+                    "hash" : "0xe84bdb475a8fdaea6ffb219b4407b125b65e1488c8ee2f656f48f5ae6e11f875",
+                    "mixHash" : "0xbb4763debf32c71a7f6f3fb40672dc7d059639d59fc973b0a518837eb6f7b63b",
+                    "nonce" : "0x34c5473b8f45691f",
                     "number" : "0x01",
                     "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
-                    "receiptTrie" : "0xe0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0d",
-                    "stateRoot" : "0x864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065",
+                    "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
+                    "stateRoot" : "0x580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0864d9e7a25acc1ded0bc74666ac0864cec29e53ae715e8908879ef19d54f1065a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0e0e174e59e593ffbe91307b938845623a33ee7d73fe81ef3d32fc773265def0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0af586fc2e5c0cb9c51e4cb06c9ad6dcec52a21943d657c9939a51b398868923288ca8e6da3417bfdeef865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0bb4763debf32c71a7f6f3fb40672dc7d059639d59fc973b0a518837eb6f7b63b8834c5473b8f45691ff865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x695179faacda2d06da02f53d8a351198c1f2d2631f8424c86c6aa9bbbc224c15",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe84bdb475a8fdaea6ffb219b4407b125b65e1488c8ee2f656f48f5ae6e11f875",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6201000051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f49da4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xa000502779ea",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6201000051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xa00050281798",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mload16bitBound_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mload16bitBound_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x10000804025c",
+                    "gasUsed" : "0x9da4",
+                    "hash" : "0xfc8c964b7b84bfb3a215d5ee26356df79b0830876b9146439ced304752bc38c5",
+                    "mixHash" : "0xe2bcc000b09fec2da5d764ff2f72c081bc22af80eed0b782ebf8d20c8c7663ed",
+                    "nonce" : "0x295e234443c799ba",
+                    "number" : "0x01",
+                    "parentHash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
+                    "receiptTrie" : "0xa51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccf",
+                    "stateRoot" : "0x580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x88d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901faa001db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0580c635d0b7f317d133f14f77e0f039e116ad48408c069e9d4f68b10471187a3a088d6ef5af056f0601897b4e7cc21208055807b114910925d4b48c7b484727400a0a51ae302d83c38e547c132b5ad8541bc3261ed442d9919152bd5eb1b03a3dccfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018610000804025c829da48203e880a0e2bcc000b09fec2da5d764ff2f72c081bc22af80eed0b782ebf8d20c8c7663ed88295e234443c799baf865f86380018610000804025c940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba072be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0ea01fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x10000804025c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72be3b0b917e373137dcaefae958cf33926e924c57f8d4d323b09e0bfc5d5c0e",
+                        "s" : "0x1fcee44156d51a5b28c2e3d17286ccf57344915b401f914c1a53eab24e815e1c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x10000804025c",
+            "gasUsed" : "0x00",
+            "hash" : "0x01db3e48429024a3b1bc933060013fbf25856beffa1f442a4b84da518e01a0ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cf",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fdf901f8a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c92f23f39edd92600b5713930185a6bb453646f8d282cca90df433bd7fca8cfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808610000804025c808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfc8c964b7b84bfb3a215d5ee26356df79b0830876b9146439ced304752bc38c5",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6201000051600155",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mload8bitBound_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mload8bitBound_d0g0v0.json
index 836ee3e79..f8cb6c313 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mload8bitBound_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mload8bitBound_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mload8bitBound_d0g0v0_EIP150" : {
+    "mload8bitBound_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/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x65b4",
-                    "hash" : "0x12a8d863f5b29f1ab5e2b9aec8e36ad0900c0a33fee3fe8739cf63824da680e8",
-                    "mixHash" : "0xe09791fe2a25cb22d48a3e0bcfb243e9fe6c1276bdd5847c274f0bdff7db8327",
-                    "nonce" : "0x30bad2e7e6d51304",
+                    "hash" : "0x58709aacc9459469d46cce3ffdefdfe63f6ba9b4aa510c2c1ca26360649970fa",
+                    "mixHash" : "0x8e4892eeda1a455bd9626ec2870e0aed9b1f14454fbaa2767828c9a79b588cda",
+                    "nonce" : "0xea9471cd1fe60223",
                     "number" : "0x01",
                     "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
-                    "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
-                    "stateRoot" : "0x93617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4",
+                    "receiptTrie" : "0xdeaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7f",
+                    "stateRoot" : "0x68ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0e09791fe2a25cb22d48a3e0bcfb243e9fe6c1276bdd5847c274f0bdff7db83278830bad2e7e6d51304f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a0deaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a08e4892eeda1a455bd9626ec2870e0aed9b1f14454fbaa2767828c9a79b588cda88ea9471cd1fe60223f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12a8d863f5b29f1ab5e2b9aec8e36ad0900c0a33fee3fe8739cf63824da680e8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x58709aacc9459469d46cce3ffdefdfe63f6ba9b4aa510c2c1ca26360649970fa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x61010051600155",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "mload8bitBound_d0g0v0_EIP158" : {
+    "mload8bitBound_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/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x65b4",
-                    "hash" : "0xb035ee434bba8685d7182ef9ed0ffad4943bbdd64d0034066d970ffcfab2223c",
-                    "mixHash" : "0x1abfac8161fd9b87eb3e33938f4e62821452b3393558981fb40edd266be8382d",
-                    "nonce" : "0x6222cc28e79bc4ae",
+                    "hash" : "0x0cd84c36daec2290330e12891d223b3840a167bc297454b591e5c52c933d7f48",
+                    "mixHash" : "0x126056374e286f4709b18070a9bf9096c534ba254d8072424986a8eedd482506",
+                    "nonce" : "0x5f7d65f6c6dcdb84",
                     "number" : "0x01",
                     "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
-                    "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
-                    "stateRoot" : "0x93617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4",
+                    "receiptTrie" : "0xdeaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7f",
+                    "stateRoot" : "0x68ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a01abfac8161fd9b87eb3e33938f4e62821452b3393558981fb40edd266be8382d886222cc28e79bc4aef862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a0deaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0126056374e286f4709b18070a9bf9096c534ba254d8072424986a8eedd482506885f7d65f6c6dcdb84f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb035ee434bba8685d7182ef9ed0ffad4943bbdd64d0034066d970ffcfab2223c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0cd84c36daec2290330e12891d223b3840a167bc297454b591e5c52c933d7f48",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x61010051600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "mload8bitBound_d0g0v0_Frontier" : {
+    "mload8bitBound_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/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x65b4",
-                    "hash" : "0x2ad302fc92a810ff579ef4ba2388adc7e381656123b0d44dc8304a2e4879980f",
-                    "mixHash" : "0xcac946daad7de14dca78c3b543d233ae5e3f74b63b5d41769fc998e7df08dc08",
-                    "nonce" : "0xb293d9b6ee26fe1f",
+                    "hash" : "0xfafd634a0800bb2e8ff47497bd258117cf4cbaf38a44d57a6a8675c0b2ba94e4",
+                    "mixHash" : "0xa3248c9187c2b03f8cef5043ee1a8f0d0480c39c9b9ac09074776b0b18e56333",
+                    "nonce" : "0x5bb556b799dbf8b7",
                     "number" : "0x01",
                     "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
                     "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0cac946daad7de14dca78c3b543d233ae5e3f74b63b5d41769fc998e7df08dc0888b293d9b6ee26fe1ff862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0a3248c9187c2b03f8cef5043ee1a8f0d0480c39c9b9ac09074776b0b18e56333885bb556b799dbf8b7f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ad302fc92a810ff579ef4ba2388adc7e381656123b0d44dc8304a2e4879980f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfafd634a0800bb2e8ff47497bd258117cf4cbaf38a44d57a6a8675c0b2ba94e4",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "mload8bitBound_d0g0v0_Homestead" : {
+    "mload8bitBound_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/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x65b4",
-                    "hash" : "0xfce41eea6f87c341d8be1818b6d76a2dbf448aa01b64d96cc5cdf5a19cdebbd9",
-                    "mixHash" : "0xf3ff989825bcbf74fda90d4c651aef7bf57d8bdcb8af718f34bc9e6431ce8078",
-                    "nonce" : "0x80192256585cffdd",
+                    "hash" : "0x4cc856bb9c47eca1ccc8e40a9317f117dcd51aec15e75ca0e4dd2a301f743c28",
+                    "mixHash" : "0x25ad73eedf0257c8247e86ac1c4d52144ed0e2f86478302f6a07a16d16df12b5",
+                    "nonce" : "0x28abcca35e6f0a37",
                     "number" : "0x01",
                     "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
                     "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0f3ff989825bcbf74fda90d4c651aef7bf57d8bdcb8af718f34bc9e6431ce80788880192256585cffddf862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a025ad73eedf0257c8247e86ac1c4d52144ed0e2f86478302f6a07a16d16df12b58828abcca35e6f0a37f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfce41eea6f87c341d8be1818b6d76a2dbf448aa01b64d96cc5cdf5a19cdebbd9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4cc856bb9c47eca1ccc8e40a9317f117dcd51aec15e75ca0e4dd2a301f743c28",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "mload8bitBound_d0g0v0_Metropolis" : {
+    "mload8bitBound_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/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x65b4",
-                    "hash" : "0x25dda5c762f5c1e95dbb6d9ab9542685d8cde38e63f8ecce43cc153410810a75",
-                    "mixHash" : "0x29fd08dbd0d39b46efc5209ae18312e26ff3d8deb0608b6f4d99bc062872c154",
-                    "nonce" : "0xcd89d277239e0f7e",
+                    "hash" : "0x7fa58083bcb1b55561bafee963ba8fb28f23090ef0c6c02b1d94f2e4a1562bf6",
+                    "mixHash" : "0x10039dad7082deaad1a2019c94184e3c100f949ff2b2b0884b2eebd9149ebd95",
+                    "nonce" : "0xd144c1659ac2b5f3",
                     "number" : "0x01",
                     "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
-                    "receiptTrie" : "0xdeaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7f",
-                    "stateRoot" : "0x68ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489",
+                    "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
+                    "stateRoot" : "0x93617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac4ad33d822b502c013c11443a05f4ec09053a03382ff425082ca80c8ad489a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a0deaf9c2859935785c5aacf5f34fec113ecaa8cbbe357015feb826a56ee170c7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a029fd08dbd0d39b46efc5209ae18312e26ff3d8deb0608b6f4d99bc062872c15488cd89d277239e0f7ef862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a010039dad7082deaad1a2019c94184e3c100f949ff2b2b0884b2eebd9149ebd9588d144c1659ac2b5f3f862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25dda5c762f5c1e95dbb6d9ab9542685d8cde38e63f8ecce43cc153410810a75",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7fa58083bcb1b55561bafee963ba8fb28f23090ef0c6c02b1d94f2e4a1562bf6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x61010051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f465b4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff9a42",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x61010051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mload8bitBound_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mload8bitBound_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x65b4",
+                    "hash" : "0x9ab6fcaf9c189810617f62d700c597ed9d3e01f9ef031823f2176fd24cdee428",
+                    "mixHash" : "0xc00e0d64632a0f3b560a5c819816cbb3ea494a892559ddbd8a2a67a316d5314d",
+                    "nonce" : "0xe8b23e9b2c77cbaa",
+                    "number" : "0x01",
+                    "parentHash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
+                    "receiptTrie" : "0x9b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73",
+                    "stateRoot" : "0x93617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a098c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093617a80627008c697e6fc725c09a6caeddff7c606722ac92f1db63f66e06ab4a04cc21e64a3c97e9cc2bcfd175dd6c4fc0fcc6cb6a4fab8e2b0e829fbbe3d9a23a09b795101f1d32f8abeced89ebf6d2e57da325cc96174a427443793d8bc926f73b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008265b48203e880a0c00e0d64632a0f3b560a5c819816cbb3ea494a892559ddbd8a2a67a316d5314d88e8b23e9b2c77cbaaf862f860800183035b60940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca0523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811a0022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x035b60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x523479aefd977c43bd2b4139af4a70f5c31afda736b3e41638e84d502dfc0811",
+                        "s" : "0x022efd1c42fdabddfb2cda7b69526a548fa95857108517f51aa36bfe989d236d",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x98c2f885c83bba1dd76e20c3c38bcf609dc2904bf8850b5e9c7b6a03c4bb732a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc8d86e5ab2eca5eb27044e50bfe2708b6108df612634733913cb040fcf208a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9ab6fcaf9c189810617f62d700c597ed9d3e01f9ef031823f2176fd24cdee428",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x61010051600155",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mload_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mload_dejavu_d0g0v0.json
index 9395f13e1..088c0581a 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mload_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mload_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mload_dejavu_d0g0v0_EIP150" : {
+    "mload_dejavu_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/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x3e639d38ceb5feef7d8c98a50870036dd9b4378cba8c5d031d29ff697c4e02f8",
-                    "mixHash" : "0x779db8da3ae3e90d1e447b9596f4c4cb7485efb16f89aa9bc5818f3bc1d2c65b",
-                    "nonce" : "0xd2812fdae44dd466",
+                    "hash" : "0xd3f2f98a7a10188634854166875eec57cfdc1f5957ff2b941689c5d9262ef35e",
+                    "mixHash" : "0xe22c71b0b2e5d92690cdce2604076403389163dbf48f4335cba1770d5fac8ee8",
+                    "nonce" : "0xadf41180e5670534",
                     "number" : "0x01",
                     "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
-                    "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
-                    "stateRoot" : "0x1cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xbfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0779db8da3ae3e90d1e447b9596f4c4cb7485efb16f89aa9bc5818f3bc1d2c65b88d2812fdae44dd466f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e22c71b0b2e5d92690cdce2604076403389163dbf48f4335cba1770d5fac8ee888adf41180e5670534f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e639d38ceb5feef7d8c98a50870036dd9b4378cba8c5d031d29ff697c4e02f8",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd3f2f98a7a10188634854166875eec57cfdc1f5957ff2b941689c5d9262ef35e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x630fffffff51",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "mload_dejavu_d0g0v0_EIP158" : {
+    "mload_dejavu_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/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x99d5b08d4f23e5d08fdb29fc542a9de3a520dfed756c6064fde9c0637c4206ab",
-                    "mixHash" : "0x194a9b2137e80048fc7dcd3130369ac74bf3b5c33157883123c3aeb1948577ba",
-                    "nonce" : "0x51087443d942f0a5",
+                    "hash" : "0x29e8b0114bd444c6b7b34ac29039daed0b171bade31ac966e415af4d31676e04",
+                    "mixHash" : "0xf359f6a60890b82a7a3d2a694d019121032d2ad17a34ae55df4fb171dff89e7d",
+                    "nonce" : "0x94f7b7fdafa400af",
                     "number" : "0x01",
                     "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
-                    "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
-                    "stateRoot" : "0x1cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xbfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0194a9b2137e80048fc7dcd3130369ac74bf3b5c33157883123c3aeb1948577ba8851087443d942f0a5f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f359f6a60890b82a7a3d2a694d019121032d2ad17a34ae55df4fb171dff89e7d8894f7b7fdafa400aff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99d5b08d4f23e5d08fdb29fc542a9de3a520dfed756c6064fde9c0637c4206ab",
-        "network" : "EIP158",
+        "lastblockhash" : "0x29e8b0114bd444c6b7b34ac29039daed0b171bade31ac966e415af4d31676e04",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x630fffffff51",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "mload_dejavu_d0g0v0_Frontier" : {
+    "mload_dejavu_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/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xa4246d8526d4ce86e99ddff95c7ae4d3545b3114622ce32c84ff4998e7f38504",
-                    "mixHash" : "0xda1c8429c78c816fffc8f35cd57ae9d01253f3dc9572a7b9658ca42d8e824b77",
-                    "nonce" : "0x6c6bdf84dd31e77c",
+                    "hash" : "0x03ef7a3de9ca6f3051f7873dfd8d2121ee1f01745e5aa9991909477e91709a7b",
+                    "mixHash" : "0x7d82a602264777ac86a04670a5c570616b51a35f4733bf3d1bab23384d953438",
+                    "nonce" : "0x414eb28c91fedcc5",
                     "number" : "0x01",
                     "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
                     "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0da1c8429c78c816fffc8f35cd57ae9d01253f3dc9572a7b9658ca42d8e824b77886c6bdf84dd31e77cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07d82a602264777ac86a04670a5c570616b51a35f4733bf3d1bab23384d95343888414eb28c91fedcc5f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4246d8526d4ce86e99ddff95c7ae4d3545b3114622ce32c84ff4998e7f38504",
-        "network" : "Frontier",
+        "lastblockhash" : "0x03ef7a3de9ca6f3051f7873dfd8d2121ee1f01745e5aa9991909477e91709a7b",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "mload_dejavu_d0g0v0_Homestead" : {
+    "mload_dejavu_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/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xf074fdc23574eb0650c65d5c5b694c5424bdb969497f3341836340d92b9a9aea",
-                    "mixHash" : "0x50480b32346138051cf7e002066cf1fb97ff568af268c0b096a059c8a96901fb",
-                    "nonce" : "0x16d3e3728987e050",
+                    "hash" : "0x11dcfb2912b913259f677ae163b669ae541da8c0019d7e67ecd923899185f3b1",
+                    "mixHash" : "0x6284ea00c1aa4088a156c9c168ad6e1c878dc4c5c8c20b45fcbca80feb9247de",
+                    "nonce" : "0x42940a6ee482ff8f",
                     "number" : "0x01",
                     "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
                     "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a050480b32346138051cf7e002066cf1fb97ff568af268c0b096a059c8a96901fb8816d3e3728987e050f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06284ea00c1aa4088a156c9c168ad6e1c878dc4c5c8c20b45fcbca80feb9247de8842940a6ee482ff8ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf074fdc23574eb0650c65d5c5b694c5424bdb969497f3341836340d92b9a9aea",
-        "network" : "Homestead",
+        "lastblockhash" : "0x11dcfb2912b913259f677ae163b669ae541da8c0019d7e67ecd923899185f3b1",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "mload_dejavu_d0g0v0_Metropolis" : {
+    "mload_dejavu_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/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x82c5802f1993f3f31d5c368d977520ef367846e4043d388f093befa548552330",
-                    "mixHash" : "0x5961ae151fb3789cb1d38e0528805e17ad20fa362768ce4b5a0868bd9ab55c25",
-                    "nonce" : "0x8ec16ca1fd15f457",
+                    "hash" : "0xbe38ba684b03b9eea0cb76838132f71050fe0eeaf81f04b811ee6ffde1670f82",
+                    "mixHash" : "0xa39f172e38f5115b0cbc1336ad29539bdc6d63fe22d0800f4cb6fb844103fe72",
+                    "nonce" : "0xa3e0bc38a6322c79",
                     "number" : "0x01",
                     "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xbfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214",
+                    "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
+                    "stateRoot" : "0x1cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfade4e5ae0ac7232c7532b99a1594100ed82c10dc919ea9a69698b020a2a214a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05961ae151fb3789cb1d38e0528805e17ad20fa362768ce4b5a0868bd9ab55c25888ec16ca1fd15f457f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a39f172e38f5115b0cbc1336ad29539bdc6d63fe22d0800f4cb6fb844103fe7288a3e0bc38a6322c79f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82c5802f1993f3f31d5c368d977520ef367846e4043d388f093befa548552330",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbe38ba684b03b9eea0cb76838132f71050fe0eeaf81f04b811ee6ffde1670f82",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x630fffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x630fffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mload_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mload_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0xdc7b51f0de1a72fd1de3e131914040edd378dd45f4f3f3829f1f0a44188763e6",
+                    "mixHash" : "0x0c05a5151b2399e003aa2edd373e171f8ae88dec47a0d2f3d2e333672441710d",
+                    "nonce" : "0xd1098fb24155817c",
+                    "number" : "0x01",
+                    "parentHash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
+                    "receiptTrie" : "0xd827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edf",
+                    "stateRoot" : "0x1cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0afddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc9c09b8f9841d1f17a6becac2b795ad076cea31adc9b27cee56ffb38582f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0d827fd4ef495674f7417966e44edbf172085936ffae594792d85a36f8d1e1edfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a00c05a5151b2399e003aa2edd373e171f8ae88dec47a0d2f3d2e333672441710d88d1098fb24155817cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xafddacc656bcf8b7af5067d1ed98031dc3e0d2a76ece89035f30f39512e03ce0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0714551f68b507d2cc089c0f813e4b69ffc25de65de5b51512d260689dc1780cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc7b51f0de1a72fd1de3e131914040edd378dd45f4f3f3829f1f0a44188763e6",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x630fffffff51",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mstore_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mstore_dejavu_d0g0v0.json
index e288643fd..818f0173f 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mstore_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mstore_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mstore_dejavu_d0g0v0_EIP150" : {
+    "mstore_dejavu_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/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x95f6dd6bd1c9ee3cc6313536bf7cc2ed7c032f8a3858af05e42211d9a4678b2c",
-                    "mixHash" : "0xca0823f6cc9f3f83bfe25c719e6d2c70f60eb65f38ae521708d1b2eee483caa5",
-                    "nonce" : "0x65c43caf7535cf5f",
+                    "hash" : "0xa727ce4c751f11f6d7180e016af53f1923accc9f197468addde029ac278ab445",
+                    "mixHash" : "0x98b7b4a254b0c58a639fd8bbf745c2f688a43d1f47ef09e04d4f6a08989f608e",
+                    "nonce" : "0x3342424d75119717",
                     "number" : "0x01",
                     "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
-                    "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
-                    "stateRoot" : "0xf64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xcdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ca0823f6cc9f3f83bfe25c719e6d2c70f60eb65f38ae521708d1b2eee483caa58865c43caf7535cf5ff864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a098b7b4a254b0c58a639fd8bbf745c2f688a43d1f47ef09e04d4f6a08989f608e883342424d75119717f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95f6dd6bd1c9ee3cc6313536bf7cc2ed7c032f8a3858af05e42211d9a4678b2c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa727ce4c751f11f6d7180e016af53f1923accc9f197468addde029ac278ab445",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff52",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "mstore_dejavu_d0g0v0_EIP158" : {
+    "mstore_dejavu_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/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xad28112df1654be451892317be4b6ef6d00c11ffbd2e9e63060135df6dda178d",
-                    "mixHash" : "0xca6a2f997b383e9f51a2f7c59c5fc9d3150752e46a59fe01268a3ec31dcc16c8",
-                    "nonce" : "0xd168e8d042265509",
+                    "hash" : "0x90c429d1ddc7863cc7a381398febd91d7d4307fde6458871185c250c3359455e",
+                    "mixHash" : "0x02010c95fc8116bbb35019fc9b275ad4ccfd12a3b7ba10728810447c032086c5",
+                    "nonce" : "0xc3931d1e6d7cff65",
                     "number" : "0x01",
                     "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
-                    "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
-                    "stateRoot" : "0xf64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xcdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ca6a2f997b383e9f51a2f7c59c5fc9d3150752e46a59fe01268a3ec31dcc16c888d168e8d042265509f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a002010c95fc8116bbb35019fc9b275ad4ccfd12a3b7ba10728810447c032086c588c3931d1e6d7cff65f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad28112df1654be451892317be4b6ef6d00c11ffbd2e9e63060135df6dda178d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x90c429d1ddc7863cc7a381398febd91d7d4307fde6458871185c250c3359455e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff52",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "mstore_dejavu_d0g0v0_Frontier" : {
+    "mstore_dejavu_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/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x2d5f8a02834797dcbd4ba28c0bd01214c3371c6eca9b7f75b85e70aeecc95e5f",
-                    "mixHash" : "0xaf63c8fae2ab6e0e3b5f34cefbc69d7471f9ad44e0bc96b336f0f7ece57d1e7e",
-                    "nonce" : "0x6cbdccdd73e1422c",
+                    "hash" : "0x33c4f7440fd1408e9b2298404eea9654500ce8e74cfc8175dcbcba0f74f5da90",
+                    "mixHash" : "0x4a908c83d78af76f6def48b4badb7993d634993b340cf8970e0ed7ec9bfe3312",
+                    "nonce" : "0x5038a0fece111a49",
                     "number" : "0x01",
                     "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
                     "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0af63c8fae2ab6e0e3b5f34cefbc69d7471f9ad44e0bc96b336f0f7ece57d1e7e886cbdccdd73e1422cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a04a908c83d78af76f6def48b4badb7993d634993b340cf8970e0ed7ec9bfe3312885038a0fece111a49f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d5f8a02834797dcbd4ba28c0bd01214c3371c6eca9b7f75b85e70aeecc95e5f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x33c4f7440fd1408e9b2298404eea9654500ce8e74cfc8175dcbcba0f74f5da90",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "mstore_dejavu_d0g0v0_Homestead" : {
+    "mstore_dejavu_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/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x832b4106c9064bf86d4ab3480babdfe02719f3f19848b4fbd805a7ae93abc9e6",
-                    "mixHash" : "0x5c6040484466a2f80deb7edd2b2cbbc9b7832c50667283b62f0d9274ed34051a",
-                    "nonce" : "0xb131719ba2f0cbba",
+                    "hash" : "0xa36fb30f47e93f5259a6f877793bc5db4378091d07db98afdfaeab72f9fc6b0c",
+                    "mixHash" : "0x4c6f968a9916ebf0ef7f0e230f79440e92a086df0af470bcdc246f5f3e964e8b",
+                    "nonce" : "0x6ae33b251e8f8a6b",
                     "number" : "0x01",
                     "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
                     "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05c6040484466a2f80deb7edd2b2cbbc9b7832c50667283b62f0d9274ed34051a88b131719ba2f0cbbaf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a04c6f968a9916ebf0ef7f0e230f79440e92a086df0af470bcdc246f5f3e964e8b886ae33b251e8f8a6bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x832b4106c9064bf86d4ab3480babdfe02719f3f19848b4fbd805a7ae93abc9e6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa36fb30f47e93f5259a6f877793bc5db4378091d07db98afdfaeab72f9fc6b0c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "mstore_dejavu_d0g0v0_Metropolis" : {
+    "mstore_dejavu_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/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x5529ffcbb38c95b6e75b6f0ba13096d1df3f31666f0d464c95307497e6afa3a6",
-                    "mixHash" : "0x018cbcb9a8b93d778b3a8154ae207dfec98238a32bee29ee071d82ce2f75cc71",
-                    "nonce" : "0x82432384e6c913ce",
+                    "hash" : "0x22d661fbf249c074e6fc89b74ea631f74d781bac839829eab20c2c09b6eeda4d",
+                    "mixHash" : "0x92b534ca0acf80939f33e28aff066bd5e3da15b3920cac901d736444939a94c8",
+                    "nonce" : "0x3e00fde7e91ab331",
                     "number" : "0x01",
                     "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xcdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6",
+                    "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
+                    "stateRoot" : "0xf64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd99bbf6c66a6bc0204739cdd129c2ad1355396491a98facee1543f18fcfef6a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0018cbcb9a8b93d778b3a8154ae207dfec98238a32bee29ee071d82ce2f75cc718882432384e6c913cef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a092b534ca0acf80939f33e28aff066bd5e3da15b3920cac901d736444939a94c8883e00fde7e91ab331f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5529ffcbb38c95b6e75b6f0ba13096d1df3f31666f0d464c95307497e6afa3a6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x22d661fbf249c074e6fc89b74ea631f74d781bac839829eab20c2c09b6eeda4d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60f1630fffffff52",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60f1630fffffff52",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mstore_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mstore_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0xca54496d132bf783bedceed5429e556002d443054777a38e36787063ca27e506",
+                    "mixHash" : "0xa753082d1ba25cfac3ca774bba5f37fea10616b1b47fec9e066e6b187fe2c8dd",
+                    "nonce" : "0x06774224674a5696",
+                    "number" : "0x01",
+                    "parentHash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
+                    "receiptTrie" : "0x244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0",
+                    "stateRoot" : "0xf64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0f55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f64dd9fbbdc4872fb1a1c5c47452aa239d68d7a260349bcc86c2c52f89fd3be9a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0244b998628cf3d86539b437e874c7c06542789bf665acf9b412243789766f0d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a753082d1ba25cfac3ca774bba5f37fea10616b1b47fec9e066e6b187fe2c8dd8806774224674a5696f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xf55133a28123e049d9e1f7474b4f29cd89a9fa55d60989dc254c8b0594f4ac3c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8dc1ca8a28bae2e42855dcd6d9950ad436b32d6b90ad674d639eac97c75031ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xca54496d132bf783bedceed5429e556002d443054777a38e36787063ca27e506",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff52",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mstroe8_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mstroe8_dejavu_d0g0v0.json
index 9bd73f148..ede803bc9 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mstroe8_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mstroe8_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mstroe8_dejavu_d0g0v0_EIP150" : {
+    "mstroe8_dejavu_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/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x495b39b9a79c4b2c8fd63fa394e6618baa9d859fe6674d2843e268d94a43fc0e",
-                    "mixHash" : "0x6bc06a968a10914c32436c015a531877b8c427a2f540520a2ecf035dfc6239e3",
-                    "nonce" : "0xebcd5384419ccaf6",
+                    "hash" : "0x1fb59c938f396ef222600208d432d7821882438b2348b3ba67f2c56bcbf36d82",
+                    "mixHash" : "0xbab19488c706271ed6f480df8a440e2c805dc3986d7d53165ef29366c04ba984",
+                    "nonce" : "0xad2900fe19cd85d7",
                     "number" : "0x01",
                     "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
-                    "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
-                    "stateRoot" : "0x6fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xe54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22de",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06bc06a968a10914c32436c015a531877b8c427a2f540520a2ecf035dfc6239e388ebcd5384419ccaf6f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22dea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0bab19488c706271ed6f480df8a440e2c805dc3986d7d53165ef29366c04ba98488ad2900fe19cd85d7f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x495b39b9a79c4b2c8fd63fa394e6618baa9d859fe6674d2843e268d94a43fc0e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1fb59c938f396ef222600208d432d7821882438b2348b3ba67f2c56bcbf36d82",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff53",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "mstroe8_dejavu_d0g0v0_EIP158" : {
+    "mstroe8_dejavu_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/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xd50c3eebe2e1f2f258efae14c31aa7939c4c0fe72637ffaeb492eeae2689be4b",
-                    "mixHash" : "0x217addb6e25fa9cee6afa1329619d815aaab9563514e51534f21e016149836bc",
-                    "nonce" : "0xc2f450e1583f3290",
+                    "hash" : "0x5c27b780319f931cb723461c7e492c1cee754b254b12a38c9a7c6598c838086b",
+                    "mixHash" : "0xf2f78e0af9f3d731a458e69a47477cf5b2e51e9c43b953d387a033dcc42479ec",
+                    "nonce" : "0xeafa510ae86d2d20",
                     "number" : "0x01",
                     "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
-                    "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
-                    "stateRoot" : "0x6fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0xe54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22de",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0217addb6e25fa9cee6afa1329619d815aaab9563514e51534f21e016149836bc88c2f450e1583f3290f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22dea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f2f78e0af9f3d731a458e69a47477cf5b2e51e9c43b953d387a033dcc42479ec88eafa510ae86d2d20f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd50c3eebe2e1f2f258efae14c31aa7939c4c0fe72637ffaeb492eeae2689be4b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5c27b780319f931cb723461c7e492c1cee754b254b12a38c9a7c6598c838086b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff53",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "mstroe8_dejavu_d0g0v0_Frontier" : {
+    "mstroe8_dejavu_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/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xbb63858920d3fee8a6bfb0089536e385e777b94cea8d05840be976b8321a0150",
-                    "mixHash" : "0x98f95852218c52901469fa3b4d0d89744629a0716f9e992118e1030c2119e8fd",
-                    "nonce" : "0x8c5f7f1e57c94b31",
+                    "hash" : "0xcbd60dc2e23f092fe72e20e119adbc26874d7f5fbab17690a9b6ecb75a9c0c45",
+                    "mixHash" : "0xca6ba5598da3311b1ba514edc57e770826a4ed66b75237746ddf794a38c08590",
+                    "nonce" : "0xb7ddef3c91a49383",
                     "number" : "0x01",
                     "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
                     "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a098f95852218c52901469fa3b4d0d89744629a0716f9e992118e1030c2119e8fd888c5f7f1e57c94b31f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ca6ba5598da3311b1ba514edc57e770826a4ed66b75237746ddf794a38c0859088b7ddef3c91a49383f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb63858920d3fee8a6bfb0089536e385e777b94cea8d05840be976b8321a0150",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcbd60dc2e23f092fe72e20e119adbc26874d7f5fbab17690a9b6ecb75a9c0c45",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "mstroe8_dejavu_d0g0v0_Homestead" : {
+    "mstroe8_dejavu_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/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x1ff4565f1c245ddf70ba0a78efdb9dca5f38b00d25ac27a776ab7ca1ad20487b",
-                    "mixHash" : "0x7d4f0d33331a82ae7e43fdf95a5dcaf538dd56b15e2a02351197aad9677f72d9",
-                    "nonce" : "0x4b1c2678073af7ab",
+                    "hash" : "0x18cf5588e65a067403133cc5a00b309e5067b0806826a85b4b7f64d41840727c",
+                    "mixHash" : "0x66b3a54d304e905b5de2cba317831667c61223334b97c697138a13c0ccd3bc8a",
+                    "nonce" : "0x978bc6fb9acf67d7",
                     "number" : "0x01",
                     "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
                     "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07d4f0d33331a82ae7e43fdf95a5dcaf538dd56b15e2a02351197aad9677f72d9884b1c2678073af7abf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a066b3a54d304e905b5de2cba317831667c61223334b97c697138a13c0ccd3bc8a88978bc6fb9acf67d7f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ff4565f1c245ddf70ba0a78efdb9dca5f38b00d25ac27a776ab7ca1ad20487b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x18cf5588e65a067403133cc5a00b309e5067b0806826a85b4b7f64d41840727c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "mstroe8_dejavu_d0g0v0_Metropolis" : {
+    "mstroe8_dejavu_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/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x03eec16701f52c73c96109881da9b8ad6166f650549e5b10c4cc2b95439c9b7f",
-                    "mixHash" : "0x7068cdfeb6ff665a60752bc3d27106e7ca7324e73572ffa77aa7f0d452545dbd",
-                    "nonce" : "0xcb674beffbff243d",
+                    "hash" : "0x83a8c687f80eebc3afa66923ba15c114fa1b53ee978af2af3fcc7eadb40d8a6f",
+                    "mixHash" : "0x6c954160f8c5475f35b97df887e0cde558eba34379696cf3237eaab1be90c07d",
+                    "nonce" : "0x1d0cb1f05c4fdd5b",
                     "number" : "0x01",
                     "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0xe54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22de",
+                    "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
+                    "stateRoot" : "0x6fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e54ec6321cc63859ae323180912eca31d8e3d4d2e4dab429d06633de910e22dea06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a07068cdfeb6ff665a60752bc3d27106e7ca7324e73572ffa77aa7f0d452545dbd88cb674beffbff243df864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a06c954160f8c5475f35b97df887e0cde558eba34379696cf3237eaab1be90c07d881d0cb1f05c4fdd5bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03eec16701f52c73c96109881da9b8ad6166f650549e5b10c4cc2b95439c9b7f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x83a8c687f80eebc3afa66923ba15c114fa1b53ee978af2af3fcc7eadb40d8a6f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60f1630fffffff53",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60f1630fffffff53",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mstroe8_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mstroe8_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x85ae2423d32617ae2a6b6be3464418a582536b1ea29b2ef4b4a8fb13c2153339",
+                    "mixHash" : "0x43334185e57575f8e11f8d8673d6e0e7a31bb73887799c2d0b2b81110a03e1d8",
+                    "nonce" : "0xd36ecca880a63881",
+                    "number" : "0x01",
+                    "parentHash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
+                    "receiptTrie" : "0x324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8",
+                    "stateRoot" : "0x6fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca08f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fb2296f8fc1fee96e623bf7f46abf02c358e47e761cfa6dcad0f423e6936f63a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0324d154c3579040682a6a95dba3ed85c4ce5f71812936cb3fd7928ce8e6e7ee8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a043334185e57575f8e11f8d8673d6e0e7a31bb73887799c2d0b2b81110a03e1d888d36ecca880a63881f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x8f994e6be55d747e05371161c6bb05d11f96bbf9ba7bc8d331581fef17d0c73c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x34d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034d072a85e4a6381af2de0266e165dc859b7e384263d69c6b63e1b23c62fa274a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x85ae2423d32617ae2a6b6be3464418a582536b1ea29b2ef4b4a8fb13c2153339",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff53",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/sha3_dejavu_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/sha3_dejavu_d0g0v0.json
index 9ebf16424..fd4106456 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/sha3_dejavu_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/sha3_dejavu_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "sha3_dejavu_d0g0v0_EIP150" : {
+    "sha3_dejavu_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/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xb49807aad8b9a03a2ed3f1ba8ac0f40c64c16c019180b5ccef445ff884717e4d",
-                    "mixHash" : "0xf9f94646bb4f9ff55b2b0a45c435b1da8d4ece85b3d946be71c67bf96b3fd5ec",
-                    "nonce" : "0x57f8b08c7ab04472",
+                    "hash" : "0x64a3a4dd2016bf6950478cc88108f76ed085557922e420e33f30633561e26fd9",
+                    "mixHash" : "0xa1f4f8867b2052585c17ef6310c9f56f3d7c78b07f9fa10a100c040e0fda2d7c",
+                    "nonce" : "0x1c1eb029087c3110",
                     "number" : "0x01",
                     "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
-                    "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
-                    "stateRoot" : "0x66b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f9f94646bb4f9ff55b2b0a45c435b1da8d4ece85b3d946be71c67bf96b3fd5ec8857f8b08c7ab04472f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0a1f4f8867b2052585c17ef6310c9f56f3d7c78b07f9fa10a100c040e0fda2d7c881c1eb029087c3110f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb49807aad8b9a03a2ed3f1ba8ac0f40c64c16c019180b5ccef445ff884717e4d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x64a3a4dd2016bf6950478cc88108f76ed085557922e420e33f30633561e26fd9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff630fffffff20",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "sha3_dejavu_d0g0v0_EIP158" : {
+    "sha3_dejavu_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/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xc885923dcde159b355b5d72b6aa3f87827e61ad5af6b09b7f3b7f0cca101eb1c",
-                    "mixHash" : "0xcc9fe06fab0f965c6b535b49ec4fdd712849f939e6431b12c0d5ddbe0b53e4d2",
-                    "nonce" : "0xab54aba6a8c7a7b2",
+                    "hash" : "0x0632b261fcfc39fd78c3a803de5a9ab43d85b3a33aa3ed01e8819029ff3f6c73",
+                    "mixHash" : "0x94bcde0472f8f03957c371d7648b42cbc7301714102f730a8c79433d5b5a54fb",
+                    "nonce" : "0x4ee13337605888b5",
                     "number" : "0x01",
                     "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
-                    "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
-                    "stateRoot" : "0x66b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30",
+                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
+                    "stateRoot" : "0x763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0cc9fe06fab0f965c6b535b49ec4fdd712849f939e6431b12c0d5ddbe0b53e4d288ab54aba6a8c7a7b2f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a094bcde0472f8f03957c371d7648b42cbc7301714102f730a8c79433d5b5a54fb884ee13337605888b5f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc885923dcde159b355b5d72b6aa3f87827e61ad5af6b09b7f3b7f0cca101eb1c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0632b261fcfc39fd78c3a803de5a9ab43d85b3a33aa3ed01e8819029ff3f6c73",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff630fffffff20",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "sha3_dejavu_d0g0v0_Frontier" : {
+    "sha3_dejavu_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/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x9cb81785c606ffbd8ef63fa208f5c67c63b7a78f8171cb456c4269d31b102b1c",
-                    "mixHash" : "0x5326aa87743c50354a383758eadf4dc577b1f893e4714d538bd5595f500bf77e",
-                    "nonce" : "0x8e4da3101a78273b",
+                    "hash" : "0x6c53193b4a3f07e1429ffa349f0a34d2c280b1e8f12ee2702667f4f2829933d6",
+                    "mixHash" : "0x805f09aca1621b874742a6240cc835286fc3f4be57f160964e7ce9f0beb1d30a",
+                    "nonce" : "0x4f122b588088944b",
                     "number" : "0x01",
                     "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
                     "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05326aa87743c50354a383758eadf4dc577b1f893e4714d538bd5595f500bf77e888e4da3101a78273bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0805f09aca1621b874742a6240cc835286fc3f4be57f160964e7ce9f0beb1d30a884f122b588088944bf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cb81785c606ffbd8ef63fa208f5c67c63b7a78f8171cb456c4269d31b102b1c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6c53193b4a3f07e1429ffa349f0a34d2c280b1e8f12ee2702667f4f2829933d6",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "sha3_dejavu_d0g0v0_Homestead" : {
+    "sha3_dejavu_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/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xefdf3684bf2dc9c3d81966bb660bb9badd178b0acf24fd9cebc78b2ba499e14e",
-                    "mixHash" : "0xc91b7fab96b3f1718dd1a1651c91645e72865b4b31651136329c5cf00b55de5c",
-                    "nonce" : "0x52deee2e82a782be",
+                    "hash" : "0xc5a6e9cae5aeb3f7abddb9b12abeab9406e3ecc8f8c5ce7bb70b2a02ec54856c",
+                    "mixHash" : "0xff4b901fd47b33d44936f7cb3e8b474779d7b1067134fe7c3607ea1b26d854df",
+                    "nonce" : "0xa784393c46a4a48c",
                     "number" : "0x01",
                     "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
                     "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0c91b7fab96b3f1718dd1a1651c91645e72865b4b31651136329c5cf00b55de5c8852deee2e82a782bef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ff4b901fd47b33d44936f7cb3e8b474779d7b1067134fe7c3607ea1b26d854df88a784393c46a4a48cf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefdf3684bf2dc9c3d81966bb660bb9badd178b0acf24fd9cebc78b2ba499e14e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc5a6e9cae5aeb3f7abddb9b12abeab9406e3ecc8f8c5ce7bb70b2a02ec54856c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "sha3_dejavu_d0g0v0_Metropolis" : {
+    "sha3_dejavu_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/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x972b6aed04e07b9e8eab25bfaef6f2b4118db763c4e89bf34a416ee66995560e",
-                    "mixHash" : "0xe643b0bcbc3d54d8d3c9acb1d64fdff4d9e939f1c546895dff51d38edc562c56",
-                    "nonce" : "0x3e4ddb1bd73b96ce",
+                    "hash" : "0xd5229b1d3ce3fd2328c4409e0396ee3fec5d4842860bb4061f714b6ad8891201",
+                    "mixHash" : "0xdcf08f7e49590bac975399c4c245bd0b7c4b2720acba3ea196ea73637b4c0ad0",
+                    "nonce" : "0x2711ab6a1a2527ac",
                     "number" : "0x01",
                     "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
-                    "receiptTrie" : "0x97fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06",
-                    "stateRoot" : "0x763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063",
+                    "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
+                    "stateRoot" : "0x66b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0763b634c33e9f108988ff20915dcbc5c89ae8335815a8d17591522ece5031063a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a097fe59b8004de685658f61c2939be1892eb8593c1ce622c392dd985946712e06b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0e643b0bcbc3d54d8d3c9acb1d64fdff4d9e939f1c546895dff51d38edc562c56883e4ddb1bd73b96cef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0dcf08f7e49590bac975399c4c245bd0b7c4b2720acba3ea196ea73637b4c0ad0882711ab6a1a2527acf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x972b6aed04e07b9e8eab25bfaef6f2b4118db763c4e89bf34a416ee66995560e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5229b1d3ce3fd2328c4409e0396ee3fec5d4842860bb4061f714b6ad8891201",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff630fffffff20",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x5a00000000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff630fffffff20",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "sha3_dejavu_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/sha3_dejavu_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0x038fdaa8cfaa89e78148e4838ef533cd04dcbff8c9d08437eb907a98d9da19a0",
+                    "mixHash" : "0xb6f7129e3c667b1705a9168b7c4d0e2f0cf102c98ab8a41939559029301a02f5",
+                    "nonce" : "0xea995b6ba0ad7ef6",
+                    "number" : "0x01",
+                    "parentHash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
+                    "receiptTrie" : "0xebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290",
+                    "stateRoot" : "0x66b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901fca0bb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066b79cfe3f7f9eaaac98f5650789c243ee9e97180230bedc3ef4d4c081324b30a06d9ef624c6e7dca5878fa00c4d8228e90e5203cdc467f05a9fe6bcda153b4b51a0ebb6f7856fd6d5d3570648ccf47356ad5b1ef866200570c2b61a7bb5b94f4290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0b6f7129e3c667b1705a9168b7c4d0e2f0cf102c98ab8a41939559029301a02f588ea995b6ba0ad7ef6f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ca08d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507a01a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d6dc99b0a23e8dce308654ebdeec71e7611a35631fecb8d8dc8fcf7ea728507",
+                        "s" : "0x1a8e552ea161ed12512983bbb20aeb975a70b5eb23792fc30d1f6aab4b92b326",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xbb85e58a303a9d0d13981c16952818a4a55ffa6b32787d32c350f75f11593cf4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fac7adccb5646ed9c90cddcc8adbf103f8ab9a0259d5fc941fd851645cb563aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x038fdaa8cfaa89e78148e4838ef533cd04dcbff8c9d08437eb907a98d9da19a0",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff630fffffff20",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1023_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1023_d0g0v0.json
index cc3337c0e..67312d2e9 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1023_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1023_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitGas_1023_d0g0v0_EIP150" : {
+    "stackLimitGas_1023_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/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf19c",
-                    "hash" : "0x2167c0f6fbb74aeaea21f7f7ac11ad7254ea4fb711ae0e90ed4a285da7b790cb",
-                    "mixHash" : "0xbfc11e49ec845c32bcf0f43d527f9818f9766648ddcede9cb4c8a972dedf364f",
-                    "nonce" : "0xdd12e69663cfd143",
+                    "hash" : "0xfb66c33b9e39c6dcad9b8872b316165e86230e476a0a4a344b4ae4c34835ddd7",
+                    "mixHash" : "0x755f75b70e4d55d634977f053046e4d66d92280c1772b31fca53e6a597db0dcd",
+                    "nonce" : "0x929419071109e71e",
                     "number" : "0x01",
                     "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
-                    "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
-                    "stateRoot" : "0x77cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4",
+                    "receiptTrie" : "0x0b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337",
+                    "stateRoot" : "0x76ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0bfc11e49ec845c32bcf0f43d527f9818f9766648ddcede9cb4c8a972dedf364f88dd12e69663cfd143f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34aca0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0755f75b70e4d55d634977f053046e4d66d92280c1772b31fca53e6a597db0dcd88929419071109e71ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2167c0f6fbb74aeaea21f7f7ac11ad7254ea4fb711ae0e90ed4a285da7b790cb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfb66c33b9e39c6dcad9b8872b316165e86230e476a0a4a344b4ae4c34835ddd7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitGas_1023_d0g0v0_EIP158" : {
+    "stackLimitGas_1023_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/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf19c",
-                    "hash" : "0xc34f3874fda1d9f58eb31a59c28936c1ca8444d72093d8f029df009d9b8a53fa",
-                    "mixHash" : "0xdcfaa05309e9d6b2f291cff1c5697a1b3067c90e3a13835820bf8a755d758f20",
-                    "nonce" : "0xe44ffb6bd49667fc",
+                    "hash" : "0x70311b84416296944f812e2ec4c6130981710761825d7dacb98c6597dad4c755",
+                    "mixHash" : "0x889e266e66a66e03dc44e723ffa93eeed6507bb1211d61f1dbf846e5fb32a4fb",
+                    "nonce" : "0xbd2c564d63e3c0ac",
                     "number" : "0x01",
                     "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
-                    "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
-                    "stateRoot" : "0x77cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4",
+                    "receiptTrie" : "0x0b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337",
+                    "stateRoot" : "0x76ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0dcfaa05309e9d6b2f291cff1c5697a1b3067c90e3a13835820bf8a755d758f2088e44ffb6bd49667fcf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34aca0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0889e266e66a66e03dc44e723ffa93eeed6507bb1211d61f1dbf846e5fb32a4fb88bd2c564d63e3c0acf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc34f3874fda1d9f58eb31a59c28936c1ca8444d72093d8f029df009d9b8a53fa",
-        "network" : "EIP158",
+        "lastblockhash" : "0x70311b84416296944f812e2ec4c6130981710761825d7dacb98c6597dad4c755",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitGas_1023_d0g0v0_Frontier" : {
+    "stackLimitGas_1023_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/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf19c",
-                    "hash" : "0x880dcf4033234efdec6b224faf2608b8673dd3996f5f227cd34d3df90f66cc46",
-                    "mixHash" : "0x8dda38f21de1a895f0ee92ba959a8b7a6a085a2d7e0fe05fb40ff77f33ff563c",
-                    "nonce" : "0xb9c58cb6e8c5094b",
+                    "hash" : "0x2902143a784c0ec92e78e66f86b0a23eef067a3d8d88e9753e006ddd8d05afd9",
+                    "mixHash" : "0xb178d0ba69cbd978acdd4100b04084066892a27918f27c77a71865a4e5feec17",
+                    "nonce" : "0xb69c6b094f36cabc",
                     "number" : "0x01",
                     "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
                     "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a08dda38f21de1a895f0ee92ba959a8b7a6a085a2d7e0fe05fb40ff77f33ff563c88b9c58cb6e8c5094bf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0b178d0ba69cbd978acdd4100b04084066892a27918f27c77a71865a4e5feec1788b69c6b094f36cabcf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x880dcf4033234efdec6b224faf2608b8673dd3996f5f227cd34d3df90f66cc46",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2902143a784c0ec92e78e66f86b0a23eef067a3d8d88e9753e006ddd8d05afd9",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitGas_1023_d0g0v0_Homestead" : {
+    "stackLimitGas_1023_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/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf19c",
-                    "hash" : "0x02e41ee3f371519819e10fbd20d92039cbd1ba3349e05904e3c8ab622e5b306b",
-                    "mixHash" : "0x9cb51c74f192f0350355606e9432400215a23d74db2f1c9c2ab66e81c9f65d2c",
-                    "nonce" : "0x7d5526e0f646e418",
+                    "hash" : "0x965baead2782c26d23eef93cc8a31fbd7301eca9a6d33c0bef4dabed3a62a29c",
+                    "mixHash" : "0x4de07b42f2c0ec25d04db977bfd54d97968b9de03a3ef5fb8c381fc781d3b40e",
+                    "nonce" : "0x43077e9d1aef312c",
                     "number" : "0x01",
                     "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
                     "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a09cb51c74f192f0350355606e9432400215a23d74db2f1c9c2ab66e81c9f65d2c887d5526e0f646e418f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a04de07b42f2c0ec25d04db977bfd54d97968b9de03a3ef5fb8c381fc781d3b40e8843077e9d1aef312cf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02e41ee3f371519819e10fbd20d92039cbd1ba3349e05904e3c8ab622e5b306b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x965baead2782c26d23eef93cc8a31fbd7301eca9a6d33c0bef4dabed3a62a29c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitGas_1023_d0g0v0_Metropolis" : {
+    "stackLimitGas_1023_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/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf19c",
-                    "hash" : "0xb6a20d422c69e6a5f55b7ecf24f0f87ab657f7c57fed819ba0c3691bf42aa8d8",
-                    "mixHash" : "0xa41ad8ab145dabd1d57944b96952d2e4e0bb28dbff700c58ce4fbe657eab9918",
-                    "nonce" : "0x914bd7f6ac0e1fcd",
+                    "hash" : "0x7edc599a0e0e2f7c5374189ea556f72dc4e7feff46d8308b95b1f2f513b32c0d",
+                    "mixHash" : "0xfcd970cbad1c65eadd89a99bdc8c533e2ea69b219ac0f88af9b813e8d53110f4",
+                    "nonce" : "0xd06f8155d1cb78e5",
                     "number" : "0x01",
                     "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
-                    "receiptTrie" : "0x0b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337",
-                    "stateRoot" : "0x76ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34ac",
+                    "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
+                    "stateRoot" : "0x77cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ede1f4ca5158f598434e216ad9b4ee7e0bc0e383795b677f540331249b34aca0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00b133d925e751aa620ea077fea4ac4e351b20e37c7ac54f7b22a11f0b8970337b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0a41ad8ab145dabd1d57944b96952d2e4e0bb28dbff700c58ce4fbe657eab991888914bd7f6ac0e1fcdf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a0fcd970cbad1c65eadd89a99bdc8c533e2ea69b219ac0f88af9b813e8d53110f488d06f8155d1cb78e5f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6a20d422c69e6a5f55b7ecf24f0f87ab657f7c57fed819ba0c3691bf42aa8d8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7edc599a0e0e2f7c5374189ea556f72dc4e7feff46d8308b95b1f2f513b32c0d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f19c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0e5a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitGas_1023_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitGas_1023_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf19c",
+                    "hash" : "0x80584313e8a45d4c29f82648537d81e7f28503cbb4c09c725261c9c8520b1713",
+                    "mixHash" : "0x3a482d4016a3e17846d94c82876c1a1767453be67318f087e8973f5fc1c96cf1",
+                    "nonce" : "0x37dd6f8bc2815a8f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
+                    "receiptTrie" : "0xb8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0de",
+                    "stateRoot" : "0x77cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0c2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077cc4a5bce3909378f28cdc804059934b96ede6550bc3aef83e2e0955d032bd4a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0b8d4baa0b6641cf1e2c73eeb6c28a5a52a78c806051a0f47736b027bc5f0b0deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f19c8203e880a03a482d4016a3e17846d94c82876c1a1767453be67318f087e8973f5fc1c96cf18837dd6f8bc2815a8ff862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xc2fd825d8203fd12efda25d0c5f0141f32dcab41fea496716769e91650edc58e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b060b0e0731010d3c11b21bec05f6cafe96b7b1d6b452919293cda8043c1379ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80584313e8a45d4c29f82648537d81e7f28503cbb4c09c725261c9c8520b1713",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1024_d0g0v0.json
index faff10e30..3e5882b2b 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1024_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitGas_1024_d0g0v0_EIP150" : {
+    "stackLimitGas_1024_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/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf1c4",
-                    "hash" : "0xf95472a464c861941c18fc4c13146f0bc8a01c40eb9dd69c9fbda08121502078",
-                    "mixHash" : "0x97ff76373b40efe5f430aa1262a7695bf525261cfc7890b039936a73cce42fb0",
-                    "nonce" : "0x9a448c1b5e6223c0",
+                    "hash" : "0xc9418f9c9a4b34631e1ad8d879efa477e75b393501305d1a1d39fe2920fcdf4a",
+                    "mixHash" : "0x28e5431c7087430f47e5073016fe2710661a50ae57c44ab5cfe20f8bbf5ca97f",
+                    "nonce" : "0xfa777537565be011",
                     "number" : "0x01",
                     "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
-                    "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
-                    "stateRoot" : "0xb46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22b",
+                    "receiptTrie" : "0xebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84",
+                    "stateRoot" : "0xd7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a097ff76373b40efe5f430aa1262a7695bf525261cfc7890b039936a73cce42fb0889a448c1b5e6223c0f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0ebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a028e5431c7087430f47e5073016fe2710661a50ae57c44ab5cfe20f8bbf5ca97f88fa777537565be011f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf95472a464c861941c18fc4c13146f0bc8a01c40eb9dd69c9fbda08121502078",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc9418f9c9a4b34631e1ad8d879efa477e75b393501305d1a1d39fe2920fcdf4a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitGas_1024_d0g0v0_EIP158" : {
+    "stackLimitGas_1024_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/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf1c4",
-                    "hash" : "0xc5f044367cf6ae49097df1683a14e0012212e10da117eea3276dc5ab959fb6fb",
-                    "mixHash" : "0xbecd6a51173c0e804d8de37a39d764cedb331986833051043226749822d2e058",
-                    "nonce" : "0xdcceb0f1bef18673",
+                    "hash" : "0xb90d7dadd853a6735b6d3cfc19c72e4d9da5d13256dd4d971364edf01fcb31ed",
+                    "mixHash" : "0xfc029493cf97c4893c622fc651054ecf815b49c44e7cb96367607eafde8aa2f4",
+                    "nonce" : "0x308f94a917ecff88",
                     "number" : "0x01",
                     "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
-                    "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
-                    "stateRoot" : "0xb46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22b",
+                    "receiptTrie" : "0xebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84",
+                    "stateRoot" : "0xd7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0becd6a51173c0e804d8de37a39d764cedb331986833051043226749822d2e05888dcceb0f1bef18673f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0ebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0fc029493cf97c4893c622fc651054ecf815b49c44e7cb96367607eafde8aa2f488308f94a917ecff88f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5f044367cf6ae49097df1683a14e0012212e10da117eea3276dc5ab959fb6fb",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb90d7dadd853a6735b6d3cfc19c72e4d9da5d13256dd4d971364edf01fcb31ed",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitGas_1024_d0g0v0_Frontier" : {
+    "stackLimitGas_1024_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/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf1c4",
-                    "hash" : "0xa6aceadb71da6df0bebead5ea8207b6af06bc4f7c12f546069a196f8ce20be25",
-                    "mixHash" : "0x451f8d5dc1bf70044fa1b2c8c9ad729d7777ab0fbb7e2f744cde81b0c4a94d2d",
-                    "nonce" : "0xe5c25d9988a655ca",
+                    "hash" : "0xbc33acdca55e51cb3b1ed4537b86e79bf8d6a75ceb983fcb3003e03a8706a61a",
+                    "mixHash" : "0x6c8d69332085707c9f4dd4a60139ea3299b3e269dcefce78b32e736e6278e267",
+                    "nonce" : "0x91cc1c0adf1fd3fe",
                     "number" : "0x01",
                     "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
                     "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0451f8d5dc1bf70044fa1b2c8c9ad729d7777ab0fbb7e2f744cde81b0c4a94d2d88e5c25d9988a655caf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a06c8d69332085707c9f4dd4a60139ea3299b3e269dcefce78b32e736e6278e2678891cc1c0adf1fd3fef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6aceadb71da6df0bebead5ea8207b6af06bc4f7c12f546069a196f8ce20be25",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbc33acdca55e51cb3b1ed4537b86e79bf8d6a75ceb983fcb3003e03a8706a61a",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitGas_1024_d0g0v0_Homestead" : {
+    "stackLimitGas_1024_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/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf1c4",
-                    "hash" : "0x767be932d6fea269a5bf39b0a613370473ae69939b4d41f6d36cd22f072b09e9",
-                    "mixHash" : "0x69cdd1541f6c21db40ea5de5086d7f12d4eeff7db1480d98148f9ed0f703cd6c",
-                    "nonce" : "0x73d50e15828a8f42",
+                    "hash" : "0xfafc6144a74290ba2c2b55341e83775948895e2ea1417522f5248c6d4b1ce615",
+                    "mixHash" : "0xf6be2ede996550196d80a694ef4efe9a86494c77c67b7555aa68339e64e22ed6",
+                    "nonce" : "0xb6b42c32c8a8c4ac",
                     "number" : "0x01",
                     "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
                     "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a069cdd1541f6c21db40ea5de5086d7f12d4eeff7db1480d98148f9ed0f703cd6c8873d50e15828a8f42f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0f6be2ede996550196d80a694ef4efe9a86494c77c67b7555aa68339e64e22ed688b6b42c32c8a8c4acf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x767be932d6fea269a5bf39b0a613370473ae69939b4d41f6d36cd22f072b09e9",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfafc6144a74290ba2c2b55341e83775948895e2ea1417522f5248c6d4b1ce615",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitGas_1024_d0g0v0_Metropolis" : {
+    "stackLimitGas_1024_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/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf1c4",
-                    "hash" : "0x8e0408a92081dd439ec3db0dd8b9421e1b9ef76f465d4819f1501ff0e6847f48",
-                    "mixHash" : "0xb6418790432f4f9731cb0fc87c4094aacd8231c04c2b0d5fe41dba334a1147c1",
-                    "nonce" : "0xe5600e481145967d",
+                    "hash" : "0x664fe1af91a7ca2d36a842dc115a4a6562b23e867473f3bbe6ea57c05f97ec2f",
+                    "mixHash" : "0xc2c57bd5b5cfd7d4015f47c4f7b1a0051495269b338ac0ea33f28245d5d0b14a",
+                    "nonce" : "0xa24eadf80f8e4ee7",
                     "number" : "0x01",
                     "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
-                    "receiptTrie" : "0xebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84",
-                    "stateRoot" : "0xd7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2",
+                    "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
+                    "stateRoot" : "0xb46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7e06471caf86c7baedc4bebc1b980b7afdab4febf34cdc8151989061bb4ced2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0ebdae94a1c01585676d0e71e2293a1b9776a6cc3d4f338dcf3dfe086425e6f84b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0b6418790432f4f9731cb0fc87c4094aacd8231c04c2b0d5fe41dba334a1147c188e5600e481145967df862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a0c2c57bd5b5cfd7d4015f47c4f7b1a0051495269b338ac0ea33f28245d5d0b14a88a24eadf80f8e4ee7f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e0408a92081dd439ec3db0dd8b9421e1b9ef76f465d4819f1501ff0e6847f48",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x664fe1af91a7ca2d36a842dc115a4a6562b23e867473f3bbe6ea57c05f97ec2f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f1c4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0e32",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitGas_1024_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitGas_1024_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf1c4",
+                    "hash" : "0x5b62f07567df4b8a6ce32d4d1effb34467fbb25fe018956248a0e14fac97260e",
+                    "mixHash" : "0x48c4efc4663a0c681b246f02692bb27626b4f58e0299409b8a30c7dc24dfd054",
+                    "nonce" : "0x5f3406740e870d2e",
+                    "number" : "0x01",
+                    "parentHash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
+                    "receiptTrie" : "0x0e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4",
+                    "stateRoot" : "0xb46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a027886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46133f062512f1c8d114e5b9fa410b28852960f5f4e3292420010b1984be22ba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00e518872db43ca9442266b1322b34ef727047a19c652e3a673ea46853b31e6c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f1c48203e880a048c4efc4663a0c681b246f02692bb27626b4f58e0299409b8a30c7dc24dfd054885f3406740e870d2ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x27886f95a8a8dd961a4a8a75d8229e19a91bc203da03b282159621fbbc70d553",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef511ed98aca6b6d4cebf1dccfce3b23750adb6df88f37ee8cc53d4b18cae569a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5b62f07567df4b8a6ce32d4d1effb34467fbb25fe018956248a0e14fac97260e",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1025_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1025_d0g0v0.json
index 1a6761314..139651b15 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1025_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitGas_1025_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitGas_1025_d0g0v0_EIP150" : {
+    "stackLimitGas_1025_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/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xcd4a6aa2d1a83ef5722c188ea8e3c5e6bd25cf06e7a2b79f00fc8eeefcffe66f",
-                    "mixHash" : "0xb6ebdfa2fdf4fc887686814b92529a27590190ad0300dc905515dfa6321cf6c9",
-                    "nonce" : "0xaa8e9c7947cb8701",
+                    "hash" : "0xa8c4028d876d9d5bc12e6cb4260fa47b2e784c1a319b665b4457b5019335cc84",
+                    "mixHash" : "0x3cc70a73be42fafc0377f9c02279b876f9ca5577173bb47ef1d9f38846d6b25d",
+                    "nonce" : "0xa417bbe3280fa56a",
                     "number" : "0x01",
                     "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
-                    "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
-                    "stateRoot" : "0xfb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x3d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0b6ebdfa2fdf4fc887686814b92529a27590190ad0300dc905515dfa6321cf6c988aa8e9c7947cb8701f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a03cc70a73be42fafc0377f9c02279b876f9ca5577173bb47ef1d9f38846d6b25d88a417bbe3280fa56af862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd4a6aa2d1a83ef5722c188ea8e3c5e6bd25cf06e7a2b79f00fc8eeefcffe66f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa8c4028d876d9d5bc12e6cb4260fa47b2e784c1a319b665b4457b5019335cc84",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitGas_1025_d0g0v0_EIP158" : {
+    "stackLimitGas_1025_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/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xb7a89ba2e701daaeae78df9378493e568f1cb7ea915faee1b5289fba7cf12f23",
-                    "mixHash" : "0x6f22319dd02513f323d0265e6620b5da5288d06ac61467298a93626e6ad2b79e",
-                    "nonce" : "0xd1cbdc2b0ea1e43a",
+                    "hash" : "0x59f43a78a45e5e85cdbae64d0731b82d0ab9310911e4ac86f7fff4a931e3a9d1",
+                    "mixHash" : "0x1a56fddb31320122f1b9257b995215b7636a127162d7b710a141383dbfde9235",
+                    "nonce" : "0x469a0d6ca668993c",
                     "number" : "0x01",
                     "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
-                    "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
-                    "stateRoot" : "0xfb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x3d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a06f22319dd02513f323d0265e6620b5da5288d06ac61467298a93626e6ad2b79e88d1cbdc2b0ea1e43af862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a01a56fddb31320122f1b9257b995215b7636a127162d7b710a141383dbfde923588469a0d6ca668993cf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a89ba2e701daaeae78df9378493e568f1cb7ea915faee1b5289fba7cf12f23",
-        "network" : "EIP158",
+        "lastblockhash" : "0x59f43a78a45e5e85cdbae64d0731b82d0ab9310911e4ac86f7fff4a931e3a9d1",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitGas_1025_d0g0v0_Frontier" : {
+    "stackLimitGas_1025_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/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xb94878192fae464343ad471900137d482d16b2e5bceac6bb9e9ea62a8c826f82",
-                    "mixHash" : "0xd2aae4764023e2ce58047f863ed06a8346ef3c6d379d6dbf3cd322d144e42c89",
-                    "nonce" : "0xc2a023cfe47fa912",
+                    "hash" : "0xc5350b93c81f8a90cf195c61fd10aa7860e6da99163fda958f0a070cc9b9dc83",
+                    "mixHash" : "0x9658ff9f213fd9d19c8491e810bf8fa638e74ec338c3d0e4fede07d70e192b25",
+                    "nonce" : "0x92d95484fb4062dd",
                     "number" : "0x01",
                     "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
                     "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0d2aae4764023e2ce58047f863ed06a8346ef3c6d379d6dbf3cd322d144e42c8988c2a023cfe47fa912f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a09658ff9f213fd9d19c8491e810bf8fa638e74ec338c3d0e4fede07d70e192b258892d95484fb4062ddf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb94878192fae464343ad471900137d482d16b2e5bceac6bb9e9ea62a8c826f82",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc5350b93c81f8a90cf195c61fd10aa7860e6da99163fda958f0a070cc9b9dc83",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitGas_1025_d0g0v0_Homestead" : {
+    "stackLimitGas_1025_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/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xa33a3795a920c0fb860cf11b43ace133ac6906b42b12306c3b75a76bd470572a",
-                    "mixHash" : "0x89b003a7cf6c8e003f5cdd3157834339f8112f1cda386d46f23ff5e86d17693e",
-                    "nonce" : "0xd1cda518c51ad987",
+                    "hash" : "0xf5e751103bde6c8e686a8dac1f6d2e5d1822b69f1319cc42b6f8d35e04d76de0",
+                    "mixHash" : "0x351775c52eacad85ae23d96e716ee15fbf5f0940627504ff56a4928f78c4875f",
+                    "nonce" : "0x940da5b3dceeb159",
                     "number" : "0x01",
                     "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
                     "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a089b003a7cf6c8e003f5cdd3157834339f8112f1cda386d46f23ff5e86d17693e88d1cda518c51ad987f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0351775c52eacad85ae23d96e716ee15fbf5f0940627504ff56a4928f78c4875f88940da5b3dceeb159f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa33a3795a920c0fb860cf11b43ace133ac6906b42b12306c3b75a76bd470572a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf5e751103bde6c8e686a8dac1f6d2e5d1822b69f1319cc42b6f8d35e04d76de0",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitGas_1025_d0g0v0_Metropolis" : {
+    "stackLimitGas_1025_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/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x2e6315f0cbcfa9818c5747804a55559848fe78427ca9f4c74c050d1cce416416",
-                    "mixHash" : "0x98c4b4e58a302556196d6fbe038dd4f4ede72a7ba3b08403af1e83a508a71889",
-                    "nonce" : "0x944202f75c347d2e",
+                    "hash" : "0x3f94b1f14f681d6f34f8171347179278aaf5a81ec525bb2182676ee0f23cf280",
+                    "mixHash" : "0x65b07adfb97065439269cd318fcf20a584410974b5c9a73b0796eccf090cfb21",
+                    "nonce" : "0xc7109f477935d032",
                     "number" : "0x01",
                     "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
-                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
-                    "stateRoot" : "0x3d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284",
+                    "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
+                    "stateRoot" : "0xfb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d40557b27743422e3886d72d396b9771cefec253944aa79f21abb3371b5d284a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a098c4b4e58a302556196d6fbe038dd4f4ede72a7ba3b08403af1e83a508a7188988944202f75c347d2ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a065b07adfb97065439269cd318fcf20a584410974b5c9a73b0796eccf090cfb2188c7109f477935d032f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e6315f0cbcfa9818c5747804a55559848fe78427ca9f4c74c050d1cce416416",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3f94b1f14f681d6f34f8171347179278aaf5a81ec525bb2182676ee0f23cf280",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f586a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffe7960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitGas_1025_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitGas_1025_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0xf14a260edfbdd545f68a6e68a824db1ef502c38ab6df81f19fd60a10416d98eb",
+                    "mixHash" : "0x8cfe6c0c9ea5b10c6a7dd2f227bbf20bc57d264b40df912012caaf7de9f47431",
+                    "nonce" : "0xebc1f7e8792a5591",
+                    "number" : "0x01",
+                    "parentHash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
+                    "receiptTrie" : "0xc9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fb",
+                    "stateRoot" : "0xfb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901faa03f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb41b1f88391ce69a3a5922756567d6f9797143ef4ad3f37e8caae2ca4fbd1d3a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0c9d85944ce8e6a711dc8fddd6c28953acd6f4d2538fc0e62816c951c85b013fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a08cfe6c0c9ea5b10c6a7dd2f227bbf20bc57d264b40df912012caaf7de9f4743188ebc1f7e8792a5591f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x3f148ecc886b053935b649c3232fc7671477e90c56ab6b91e3564634d81c0389",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3c12f8a4e05adea6ad5a6ef2d0e6412cf4a49e12319e24d29f6a2a71bcece0ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf14a260edfbdd545f68a6e68a824db1ef502c38ab6df81f19fd60a10416d98eb",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1023_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1023_d0g0v0.json
index d9e2e3fbc..736c791d5 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1023_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1023_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush31_1023_d0g0v0_EIP150" : {
+    "stackLimitPush31_1023_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/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x3dc23c91604d410557a7247e6b7dd5b56d697a0bc3a492eafb179d98251cabda",
-                    "mixHash" : "0x155469721393e371c7e65f06b525b55e072381c15235a423d4fca7659df744e6",
-                    "nonce" : "0x5e04b48d9e8e595d",
+                    "hash" : "0x59224e80a6de153f56420f0ea6d2461ce461b4394d31c6f735bc537b58b81431",
+                    "mixHash" : "0xbdd86f0ffa7f2cde1536fabbb0641803e66794b4376e2da325b830ed1b553c37",
+                    "nonce" : "0xaecb244174c742cb",
                     "number" : "0x01",
                     "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
-                    "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
-                    "stateRoot" : "0xca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688f",
+                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
+                    "stateRoot" : "0xc8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0155469721393e371c7e65f06b525b55e072381c15235a423d4fca7659df744e6885e04b48d9e8e595df862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0bdd86f0ffa7f2cde1536fabbb0641803e66794b4376e2da325b830ed1b553c3788aecb244174c742cbf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3dc23c91604d410557a7247e6b7dd5b56d697a0bc3a492eafb179d98251cabda",
-        "network" : "EIP150",
+        "lastblockhash" : "0x59224e80a6de153f56420f0ea6d2461ce461b4394d31c6f735bc537b58b81431",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush31_1023_d0g0v0_EIP158" : {
+    "stackLimitPush31_1023_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/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x82c9ed80a40bdb4d6bd06c593c58768c218c5ee470478354639b9f981df4572e",
-                    "mixHash" : "0x37d99d9668d37a042759a33843c4ea37f3a16db000b6a3ab32ee224b7cf89cd7",
-                    "nonce" : "0xfbcefff814270ae1",
+                    "hash" : "0x87d0c9522ffa44c912512a17496ae94dd82c5ea577c0308d754810583affa8a4",
+                    "mixHash" : "0xb66f72eca603952c62b8cf80091e90c4c43e6893b27cc21af7bb46da359d1a4d",
+                    "nonce" : "0xe3910ef609747eb7",
                     "number" : "0x01",
                     "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
-                    "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
-                    "stateRoot" : "0xca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688f",
+                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
+                    "stateRoot" : "0xc8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a037d99d9668d37a042759a33843c4ea37f3a16db000b6a3ab32ee224b7cf89cd788fbcefff814270ae1f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0b66f72eca603952c62b8cf80091e90c4c43e6893b27cc21af7bb46da359d1a4d88e3910ef609747eb7f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82c9ed80a40bdb4d6bd06c593c58768c218c5ee470478354639b9f981df4572e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x87d0c9522ffa44c912512a17496ae94dd82c5ea577c0308d754810583affa8a4",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush31_1023_d0g0v0_Frontier" : {
+    "stackLimitPush31_1023_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/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x792457690a495acac6f02549e615d62e84b35111048783e8f7388f7567f0d2cd",
-                    "mixHash" : "0x01f458e1af301096ca3a61bea66bfb09cadaf39e02f83646604a9db0daf436ee",
-                    "nonce" : "0x8a9827fc0e9156ad",
+                    "hash" : "0xb742b0a4e5047a402988813a82c9789742a16b0b3741bd0fb97794f2af105012",
+                    "mixHash" : "0x365cd5f6220c003866934872fbdf413f02d059451765a0d5217ac415d1b61a5f",
+                    "nonce" : "0x82daa51a08aac19a",
                     "number" : "0x01",
                     "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
                     "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a001f458e1af301096ca3a61bea66bfb09cadaf39e02f83646604a9db0daf436ee888a9827fc0e9156adf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0365cd5f6220c003866934872fbdf413f02d059451765a0d5217ac415d1b61a5f8882daa51a08aac19af862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x792457690a495acac6f02549e615d62e84b35111048783e8f7388f7567f0d2cd",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb742b0a4e5047a402988813a82c9789742a16b0b3741bd0fb97794f2af105012",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush31_1023_d0g0v0_Homestead" : {
+    "stackLimitPush31_1023_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/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x1e6c19aea28d15b2b002bc77f41d83d542d926f12768e81f0ee881ba1cfd11a1",
-                    "mixHash" : "0xeb2278d63e754ba133156295a6782de52070b10352bfe3df46fd0ab6a6689063",
-                    "nonce" : "0xf9c5b7c67e034b2b",
+                    "hash" : "0x7def7d74d8471587d8819a1cc617837bcc38c3c8d02b6db29cff87a376c54f50",
+                    "mixHash" : "0xdee5646d36a9191cf94e27b8e20520b4f7c4aeb7eca5be2889aba2a7b8d16356",
+                    "nonce" : "0xbe1d2eb018f42232",
                     "number" : "0x01",
                     "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
                     "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0eb2278d63e754ba133156295a6782de52070b10352bfe3df46fd0ab6a668906388f9c5b7c67e034b2bf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0dee5646d36a9191cf94e27b8e20520b4f7c4aeb7eca5be2889aba2a7b8d1635688be1d2eb018f42232f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e6c19aea28d15b2b002bc77f41d83d542d926f12768e81f0ee881ba1cfd11a1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7def7d74d8471587d8819a1cc617837bcc38c3c8d02b6db29cff87a376c54f50",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush31_1023_d0g0v0_Metropolis" : {
+    "stackLimitPush31_1023_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/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0xf5181aeeb9def494a3159b8cc5e95349936bd17822740a506639d3ab418ecf17",
-                    "mixHash" : "0x9f70b602e7e5dc604e53e7347d16ed3335ab06f433667e4e246d5cf8962e0d10",
-                    "nonce" : "0x1acdbbc803d3ac02",
+                    "hash" : "0x60626a0258c0f461812cf914f88f208ef1196320141c17b291465792b59af7ea",
+                    "mixHash" : "0xf899a1b5feb546c1c5c805b65443269f830a6aee0e840f2a1b89f823ea50f197",
+                    "nonce" : "0xc66574f554a02b1f",
                     "number" : "0x01",
                     "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
-                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
-                    "stateRoot" : "0xc8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967",
+                    "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
+                    "stateRoot" : "0xca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8d6dc7354c532fb5901ccfc6da9e08851faa14be53b00fb1b41116d7cc63967a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a09f70b602e7e5dc604e53e7347d16ed3335ab06f433667e4e246d5cf8962e0d10881acdbbc803d3ac02f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0f899a1b5feb546c1c5c805b65443269f830a6aee0e840f2a1b89f823ea50f19788c66574f554a02b1ff862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5181aeeb9def494a3159b8cc5e95349936bd17822740a506639d3ab418ecf17",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x60626a0258c0f461812cf914f88f208ef1196320141c17b291465792b59af7ea",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f599",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0a5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush31_1023_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush31_1023_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf599",
+                    "hash" : "0xd6d8bd96a7ad238d90ccd2c6ddf564462d1b9f44f3d4ccafa85aa0855b2b2598",
+                    "mixHash" : "0x34f5e462f886ef2545ebde24352bba173f7b5735009791eed932361c97d851e1",
+                    "nonce" : "0x21953c08ab82995f",
+                    "number" : "0x01",
+                    "parentHash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
+                    "receiptTrie" : "0x0ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23f",
+                    "stateRoot" : "0xca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a060b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca306f9116964acf61bb3be20a98286e80a68023c5a675dc69e2f9a2fc1e688fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea00ac9fd704e5301240ca0c4198cb9851f2a90cdf20d4a1e8eabaa69621910c23fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a034f5e462f886ef2545ebde24352bba173f7b5735009791eed932361c97d851e18821953c08ab82995ff862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x60b289638e847815caf57ed2bf2cdba99cafe6c81934848e2f455a1ef6907764",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e995356b1ea04665c391275d501d3b61c907f1ef1bf0cded9874ff07355378ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd6d8bd96a7ad238d90ccd2c6ddf564462d1b9f44f3d4ccafa85aa0855b2b2598",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1024_d0g0v0.json
index d13841ded..6c031e23b 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1024_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush31_1024_d0g0v0_EIP150" : {
+    "stackLimitPush31_1024_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/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0xb0e29ee4a077bbbae6ef3999e400e618bdaee6078d3a9c6e36e56ba925117144",
-                    "mixHash" : "0xb7c2aa3aec74fad6f195722717d8ec13c77f7b811180fc059d6623135fa744e2",
-                    "nonce" : "0x2a743488cdcf7f60",
+                    "hash" : "0x1cf042e2a83edfff8d4e937965494425642a58f0bd85d31b56122cd4a15904f1",
+                    "mixHash" : "0xad1c61622ec97065e7861e4fb8c2219795a734548ac0ec7cbfdd9b1947a7fa8f",
+                    "nonce" : "0x4ee616aaa670c606",
                     "number" : "0x01",
                     "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
-                    "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
-                    "stateRoot" : "0x801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135d",
+                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
+                    "stateRoot" : "0x0041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0b7c2aa3aec74fad6f195722717d8ec13c77f7b811180fc059d6623135fa744e2882a743488cdcf7f60f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0ad1c61622ec97065e7861e4fb8c2219795a734548ac0ec7cbfdd9b1947a7fa8f884ee616aaa670c606f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0e29ee4a077bbbae6ef3999e400e618bdaee6078d3a9c6e36e56ba925117144",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1cf042e2a83edfff8d4e937965494425642a58f0bd85d31b56122cd4a15904f1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush31_1024_d0g0v0_EIP158" : {
+    "stackLimitPush31_1024_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/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x799aa2da8c3e6d4a8dad89630b9db4866a405826f4146c41bb7eaf127f828edb",
-                    "mixHash" : "0xe3dbb6014d9eb34d7afe231c99a225e400829e438368fdaac9d1c59d828888dc",
-                    "nonce" : "0xaced455dd40a7064",
+                    "hash" : "0x5f884ce9fc5f45e1635f67c9e60cfe125818495e5bd39d1c6b3e12a57de0606b",
+                    "mixHash" : "0x1868124f327fb20c68cc3ff71cdba69119055e9e49033d4eae61648bdb4bfa56",
+                    "nonce" : "0x98401d9b64fb5d0c",
                     "number" : "0x01",
                     "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
-                    "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
-                    "stateRoot" : "0x801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135d",
+                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
+                    "stateRoot" : "0x0041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0e3dbb6014d9eb34d7afe231c99a225e400829e438368fdaac9d1c59d828888dc88aced455dd40a7064f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a01868124f327fb20c68cc3ff71cdba69119055e9e49033d4eae61648bdb4bfa568898401d9b64fb5d0cf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x799aa2da8c3e6d4a8dad89630b9db4866a405826f4146c41bb7eaf127f828edb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f884ce9fc5f45e1635f67c9e60cfe125818495e5bd39d1c6b3e12a57de0606b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush31_1024_d0g0v0_Frontier" : {
+    "stackLimitPush31_1024_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/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x93a8bac804ffc0f97d294a1d7a54c44f2b2b1bce74ad23a437f5908af8820593",
-                    "mixHash" : "0x999c05cbbe6d36860459d62459ee662fb7fae72aab9eb93c6dcec79014bd3ca7",
-                    "nonce" : "0x1cdc783c52af2811",
+                    "hash" : "0xfbc9adb4df90fccb1f561360b07bf44fe33bf5f744964319dba6d4b0b92879d2",
+                    "mixHash" : "0x16f93a5c5ad67c1b5d5d04ed1744a282791c4b5b3d0f4c0abb8140c981e3ebb8",
+                    "nonce" : "0x622ae8a1d7dd12d6",
                     "number" : "0x01",
                     "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
                     "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0999c05cbbe6d36860459d62459ee662fb7fae72aab9eb93c6dcec79014bd3ca7881cdc783c52af2811f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a016f93a5c5ad67c1b5d5d04ed1744a282791c4b5b3d0f4c0abb8140c981e3ebb888622ae8a1d7dd12d6f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93a8bac804ffc0f97d294a1d7a54c44f2b2b1bce74ad23a437f5908af8820593",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfbc9adb4df90fccb1f561360b07bf44fe33bf5f744964319dba6d4b0b92879d2",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush31_1024_d0g0v0_Homestead" : {
+    "stackLimitPush31_1024_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/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x2bfd7bff7caffc6a973c87246b6acec700b856bdea75621e22d137d48311e44b",
-                    "mixHash" : "0x933fb5f53a7d41be6ead448f517c3fc1ffcf44dbe1ef3b60d873a8e23aff0316",
-                    "nonce" : "0x0df353c7f4760970",
+                    "hash" : "0xf12afa0d2ea403c07ab0d1b1437b5b6615488a8c8bfa0a30d39fd16db5efb197",
+                    "mixHash" : "0xe8771d2b6607e4eb4da2d7532a875343276179e8fd22568541853ec9a5e1d11c",
+                    "nonce" : "0x35e61741be4f6d31",
                     "number" : "0x01",
                     "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
                     "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0933fb5f53a7d41be6ead448f517c3fc1ffcf44dbe1ef3b60d873a8e23aff0316880df353c7f4760970f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0e8771d2b6607e4eb4da2d7532a875343276179e8fd22568541853ec9a5e1d11c8835e61741be4f6d31f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bfd7bff7caffc6a973c87246b6acec700b856bdea75621e22d137d48311e44b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf12afa0d2ea403c07ab0d1b1437b5b6615488a8c8bfa0a30d39fd16db5efb197",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush31_1024_d0g0v0_Metropolis" : {
+    "stackLimitPush31_1024_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/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x6d37442e04c4c04577db31613fa8a7576dd2560e69170e8acbe4b5b0c4a9b1ba",
-                    "mixHash" : "0x25c8c54d103467a9b7ebea5275b0d5ec2ae76db558ad6e9d5dd9caaec9c9cc41",
-                    "nonce" : "0xf0fdb72fbde34ca4",
+                    "hash" : "0xb341d4c714a125b088c48c457712432978cb241a495645c17bca983316907c6e",
+                    "mixHash" : "0x4b4169533d320ab6708d7fe28971d8e5aec34582e2dfd9665b7168f7c71f5987",
+                    "nonce" : "0xd6c49ee7379db147",
                     "number" : "0x01",
                     "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
-                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
-                    "stateRoot" : "0x0041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5d",
+                    "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
+                    "stateRoot" : "0x801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00041d5b57bbfbbd21b50fb9e601972225a09411a8eb1ff32d7978cb406480d5da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a025c8c54d103467a9b7ebea5275b0d5ec2ae76db558ad6e9d5dd9caaec9c9cc4188f0fdb72fbde34ca4f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a04b4169533d320ab6708d7fe28971d8e5aec34582e2dfd9665b7168f7c71f598788d6c49ee7379db147f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d37442e04c4c04577db31613fa8a7576dd2560e69170e8acbe4b5b0c4a9b1ba",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb341d4c714a125b088c48c457712432978cb241a495645c17bca983316907c6e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f5c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0a34",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush31_1024_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush31_1024_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf5c2",
+                    "hash" : "0xd09041bd50c9467e0eb4c718b6fe10a23e29d7c9ef286dafed35234f3fa7b5d2",
+                    "mixHash" : "0x9cfb69dcf44df2e372e61e03e64b8cc5ae8cfa560b5370fd4f51345745cb1c5b",
+                    "nonce" : "0x01614397a639a711",
+                    "number" : "0x01",
+                    "parentHash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
+                    "receiptTrie" : "0x9109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fa",
+                    "stateRoot" : "0x801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0801190cc0324a89bd7ed1ca453282d463f19346585c31634d38f43294bff135da0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea09109d888f9ddef66a59f549bd7ceecfb65c56ffdc5b24ae8bc2c3c050afae0fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a09cfb69dcf44df2e372e61e03e64b8cc5ae8cfa560b5370fd4f51345745cb1c5b8801614397a639a711f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x459a07859844e1e1f5759449c5caad39dcc9f8ef796e63e79254ecae5c611846",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eef",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0654c6ee8a92aa72ee8112aa9c8387b367b94a0c5af80a9cbe8d0803bc6867eefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd09041bd50c9467e0eb4c718b6fe10a23e29d7c9ef286dafed35234f3fa7b5d2",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1025_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1025_d0g0v0.json
index 095f3164d..9770401f9 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1025_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush31_1025_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush31_1025_d0g0v0_EIP150" : {
+    "stackLimitPush31_1025_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/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x57420eed311f9463555ebfd41ddfe90f984db13eecc158046fee814d7a0ecc02",
-                    "mixHash" : "0xb93a781f1fa1f6fc55dd9c88f90428bfdae75b4963cd783d834826911ce535ad",
-                    "nonce" : "0x289402c76bc2e6d2",
+                    "hash" : "0xb3c6d476a1744a8bc59a1a4eeb0de8affe2a5a4539d400e43ea472b285344f3c",
+                    "mixHash" : "0x0e631c62e3cf402220b3e3ee21a43340fed2bad5052ccc1399c03a827d750087",
+                    "nonce" : "0x47c6c3c7513c41ef",
                     "number" : "0x01",
                     "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
-                    "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
-                    "stateRoot" : "0x44ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x7e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0b93a781f1fa1f6fc55dd9c88f90428bfdae75b4963cd783d834826911ce535ad88289402c76bc2e6d2f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a00e631c62e3cf402220b3e3ee21a43340fed2bad5052ccc1399c03a827d7500878847c6c3c7513c41eff862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57420eed311f9463555ebfd41ddfe90f984db13eecc158046fee814d7a0ecc02",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb3c6d476a1744a8bc59a1a4eeb0de8affe2a5a4539d400e43ea472b285344f3c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush31_1025_d0g0v0_EIP158" : {
+    "stackLimitPush31_1025_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/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xa8a3f369f62dd6b5c142bfbca3dbcae63d8ff457c5568669698edd8f02217a90",
-                    "mixHash" : "0x711d576fdf1abe2cedf0d13db6bb257ed668354c126576bb26950753dff06b4e",
-                    "nonce" : "0x49724635b9b44506",
+                    "hash" : "0x413609cf45304bdccd61a0c1fbb1a9d440f400dae5f48a01e6cac28e71be218a",
+                    "mixHash" : "0x1e99976b89d9e52eaf5e6b2639e9842d20cb807530a6fd3a4b3b337a7f06d955",
+                    "nonce" : "0xbd4bda9f77f81610",
                     "number" : "0x01",
                     "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
-                    "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
-                    "stateRoot" : "0x44ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x7e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0711d576fdf1abe2cedf0d13db6bb257ed668354c126576bb26950753dff06b4e8849724635b9b44506f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a01e99976b89d9e52eaf5e6b2639e9842d20cb807530a6fd3a4b3b337a7f06d95588bd4bda9f77f81610f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8a3f369f62dd6b5c142bfbca3dbcae63d8ff457c5568669698edd8f02217a90",
-        "network" : "EIP158",
+        "lastblockhash" : "0x413609cf45304bdccd61a0c1fbb1a9d440f400dae5f48a01e6cac28e71be218a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush31_1025_d0g0v0_Frontier" : {
+    "stackLimitPush31_1025_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/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x37adf47e07c8bae111b32ea214102ed789f35dce21cb1a9202b62cfdec1edff3",
-                    "mixHash" : "0x81152668266fc5bbcb9eed5ab1981d928d53cbbdb40c522d59e4a2ff81d23ec4",
-                    "nonce" : "0xfe9ae2a2a2130a44",
+                    "hash" : "0xa8b444396baf475f1479eaf40ae264716cc7fcd616aec3c9958267ce1635c13b",
+                    "mixHash" : "0x05c6b23f4dcd26e3033d5640d5b6269feec3b21da70a5eea9d41fffe2ff5a982",
+                    "nonce" : "0xa2d23d0509cc2ba8",
                     "number" : "0x01",
                     "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
                     "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a081152668266fc5bbcb9eed5ab1981d928d53cbbdb40c522d59e4a2ff81d23ec488fe9ae2a2a2130a44f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a005c6b23f4dcd26e3033d5640d5b6269feec3b21da70a5eea9d41fffe2ff5a98288a2d23d0509cc2ba8f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37adf47e07c8bae111b32ea214102ed789f35dce21cb1a9202b62cfdec1edff3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa8b444396baf475f1479eaf40ae264716cc7fcd616aec3c9958267ce1635c13b",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush31_1025_d0g0v0_Homestead" : {
+    "stackLimitPush31_1025_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/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x3fb63db7539b4f1f5097243c2e9e3f2912f4aa8788424e630f5d5109a26d3fd9",
-                    "mixHash" : "0x4c5212ac1406d07bb4ca6cf4012426576d9e542a561d52b3e916ad848a46f5eb",
-                    "nonce" : "0x763e5d1d4994aee5",
+                    "hash" : "0x35c6c4e47068a48aeed512576ec191d2b7061ba1fcc6496970937f7ee11791f0",
+                    "mixHash" : "0x71d662446036addb9e223263a6eb8f6b1dddd213e4fe2641e56ae6977ac623e6",
+                    "nonce" : "0x01c7bd162a44ac21",
                     "number" : "0x01",
                     "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
                     "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a04c5212ac1406d07bb4ca6cf4012426576d9e542a561d52b3e916ad848a46f5eb88763e5d1d4994aee5f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a071d662446036addb9e223263a6eb8f6b1dddd213e4fe2641e56ae6977ac623e68801c7bd162a44ac21f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fb63db7539b4f1f5097243c2e9e3f2912f4aa8788424e630f5d5109a26d3fd9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x35c6c4e47068a48aeed512576ec191d2b7061ba1fcc6496970937f7ee11791f0",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush31_1025_d0g0v0_Metropolis" : {
+    "stackLimitPush31_1025_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/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xef0c5a917a3ed3740689589cb4e95d15b647cb7e81f41a59a5e48bf84238b443",
-                    "mixHash" : "0xbc4bab4108777da8457232a31f2613ba761e8b6e8b85be46ec17390334c96fd2",
-                    "nonce" : "0x23befc53cf551be9",
+                    "hash" : "0x718bbbf0dbd3a49f71bb1e6aba2d08221b9759ec5b913a9df46e9869af903c30",
+                    "mixHash" : "0xff682fdf0cfc08fae86ccba40df924aa96681508fad6e03ea60ba664b74f65b8",
+                    "nonce" : "0xcacac77fcf6cb60b",
                     "number" : "0x01",
                     "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
-                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
-                    "stateRoot" : "0x7e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32",
+                    "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
+                    "stateRoot" : "0x44ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e25184cf9c2d053318bc0eb8ab1618637c124ab1d95eb55e2d9018d2d656f32a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0bc4bab4108777da8457232a31f2613ba761e8b6e8b85be46ec17390334c96fd28823befc53cf551be9f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0ff682fdf0cfc08fae86ccba40df924aa96681508fad6e03ea60ba664b74f65b888cacac77fcf6cb60bf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef0c5a917a3ed3740689589cb4e95d15b647cb7e81f41a59a5e48bf84238b443",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x718bbbf0dbd3a49f71bb1e6aba2d08221b9759ec5b913a9df46e9869af903c30",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f586a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffe7960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush31_1025_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush31_1025_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0xfeea9e7ffb30e4d6f2bfde7d168aee1b5afe8d3b67b18765414a6e20f5da5a99",
+                    "mixHash" : "0x484a09cfaa12205f47a6177feac7c5f2060e1022b679814707d65f96d8c89567",
+                    "nonce" : "0x6d516ddf8e7c4193",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
+                    "receiptTrie" : "0x1ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409",
+                    "stateRoot" : "0x44ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901faa0b3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044ab0d46a6a9a4dfa282babe9d0fc3ee087c1ff27e59d6c2395dbcef72cb9b46a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea01ac759af74dd07450d4eec5e238b92ea6932e3505009a9a7184f743cc7763409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0484a09cfaa12205f47a6177feac7c5f2060e1022b679814707d65f96d8c89567886d516ddf8e7c4193f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xb3375615e1a624ea198e58ceb16358febb834d0476fc36302c760631699cf378",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdb76bb5ec7f93a03976b93ee0c5e369a6f99aac7ac2cb9c1af1a668f8672fd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfeea9e7ffb30e4d6f2bfde7d168aee1b5afe8d3b67b18765414a6e20f5da5a99",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1023_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1023_d0g0v0.json
index 540f59047..998523564 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1023_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1023_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush32_1023_d0g0v0_EIP150" : {
+    "stackLimitPush32_1023_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/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x6dcef788e0de03260fcedc64493d3cad9ec2eabd7fb6717acfba6d4615044011",
-                    "mixHash" : "0x61b5ef33111d4931618b23d4ae43ec9a782764cff45db3f4b78288ba76157b27",
-                    "nonce" : "0x032264d4a72ca8ab",
+                    "hash" : "0x2ac07290ffbed46dcfc82745a9fc2d26190e90aed612571ccea6385d35530d64",
+                    "mixHash" : "0x4933a9744d5bff0b52db0c87dfc17fafacc62e6a4d6801156d4d71f49c42d262",
+                    "nonce" : "0xb48c0ed9d9c5968a",
                     "number" : "0x01",
                     "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
-                    "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
-                    "stateRoot" : "0x7d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7",
+                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
+                    "stateRoot" : "0x3b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a061b5ef33111d4931618b23d4ae43ec9a782764cff45db3f4b78288ba76157b2788032264d4a72ca8abf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a04933a9744d5bff0b52db0c87dfc17fafacc62e6a4d6801156d4d71f49c42d26288b48c0ed9d9c5968af862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6dcef788e0de03260fcedc64493d3cad9ec2eabd7fb6717acfba6d4615044011",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2ac07290ffbed46dcfc82745a9fc2d26190e90aed612571ccea6385d35530d64",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush32_1023_d0g0v0_EIP158" : {
+    "stackLimitPush32_1023_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/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x11a5127e1354027245ee27e8082fd64ca07da0ab069a7fd5d8f2372fdae3ad51",
-                    "mixHash" : "0xf148324eba6f097af5fbcd7e0e500df772206f900fb5fc5bab557d417942ab62",
-                    "nonce" : "0xdb5217db52c3648b",
+                    "hash" : "0x14b8ab6a41add478cc5c95e98a188c596ce83e0eb8ba81ae98638aab5a24bb9b",
+                    "mixHash" : "0xedea4d928d94c8c0cfa6570bd8d13802271b1382233968069e352affeb608c09",
+                    "nonce" : "0xe988429aafa4d89b",
                     "number" : "0x01",
                     "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
-                    "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
-                    "stateRoot" : "0x7d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7",
+                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
+                    "stateRoot" : "0x3b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0f148324eba6f097af5fbcd7e0e500df772206f900fb5fc5bab557d417942ab6288db5217db52c3648bf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0edea4d928d94c8c0cfa6570bd8d13802271b1382233968069e352affeb608c0988e988429aafa4d89bf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11a5127e1354027245ee27e8082fd64ca07da0ab069a7fd5d8f2372fdae3ad51",
-        "network" : "EIP158",
+        "lastblockhash" : "0x14b8ab6a41add478cc5c95e98a188c596ce83e0eb8ba81ae98638aab5a24bb9b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush32_1023_d0g0v0_Frontier" : {
+    "stackLimitPush32_1023_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/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x2405ae79a2394c14277f2d763214b11ddc28717c5561d0ed915c8ae7b9fcab8f",
-                    "mixHash" : "0x31042c17f1ea13b232ce33b8328d3ac9b64b62dbc4a1ed24b29f1b54af17da52",
-                    "nonce" : "0xb524bfd02f7408be",
+                    "hash" : "0x6702806899c4abe3b8ed10043d82fafed3a74fd34d22fc45e3c84ba893b3956c",
+                    "mixHash" : "0xfbf2c78de9a81ba41d72468375740e529d9bd76c939b8bc505f355feeb616151",
+                    "nonce" : "0xa1d37d65877a4037",
                     "number" : "0x01",
                     "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
                     "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a031042c17f1ea13b232ce33b8328d3ac9b64b62dbc4a1ed24b29f1b54af17da5288b524bfd02f7408bef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0fbf2c78de9a81ba41d72468375740e529d9bd76c939b8bc505f355feeb61615188a1d37d65877a4037f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2405ae79a2394c14277f2d763214b11ddc28717c5561d0ed915c8ae7b9fcab8f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6702806899c4abe3b8ed10043d82fafed3a74fd34d22fc45e3c84ba893b3956c",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush32_1023_d0g0v0_Homestead" : {
+    "stackLimitPush32_1023_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/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0x42638e330eaafd150107cb60d202bbd1559b84d6674b786b78ca8f49ab05bdb1",
-                    "mixHash" : "0x484baa4b67910ffe706f3f6f635dbb717d5abb3b9152c254b56ae411cb7b8da0",
-                    "nonce" : "0xdadfd055331d728e",
+                    "hash" : "0x9473d074c6031ce46e87d615f5b270562d4e73d86be73649df407038e638a585",
+                    "mixHash" : "0x4905411d132427d3ad47e082d814d948122d0c8fc2bb95a4bcb67415d40d8659",
+                    "nonce" : "0xc18913bbc83eda98",
                     "number" : "0x01",
                     "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
                     "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0484baa4b67910ffe706f3f6f635dbb717d5abb3b9152c254b56ae411cb7b8da088dadfd055331d728ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a04905411d132427d3ad47e082d814d948122d0c8fc2bb95a4bcb67415d40d865988c18913bbc83eda98f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42638e330eaafd150107cb60d202bbd1559b84d6674b786b78ca8f49ab05bdb1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9473d074c6031ce46e87d615f5b270562d4e73d86be73649df407038e638a585",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush32_1023_d0g0v0_Metropolis" : {
+    "stackLimitPush32_1023_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/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf599",
-                    "hash" : "0xea387fe0a0b021923cd410278fb47c8d6ad898cb09ba472c4e2308b1f3b67101",
-                    "mixHash" : "0x7bc667bdf7ee35bef026c55be6a66e17b018fc5a395b422e0754d50d1af2351d",
-                    "nonce" : "0xa042ca3feb78e280",
+                    "hash" : "0xdabfca24240284c28404371dbceb93753ec8f89046a6b029be845b74aa7230b5",
+                    "mixHash" : "0x21b7ce80ba0c20311f4ecc0bd3028035f1a1f2bd22ce4039570513b528ceed62",
+                    "nonce" : "0x145cbb91b8a2a46e",
                     "number" : "0x01",
                     "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
-                    "receiptTrie" : "0x29979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50",
-                    "stateRoot" : "0x3b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401",
+                    "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
+                    "stateRoot" : "0x7d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b6513fa20eb22d8004d7e107665d26782dae3d008852055a1245f1d4aff6401a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea029979c4dcd49c7b93ec87b187afe1a548ab91cbf7087275a5451548ac5646e50b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a07bc667bdf7ee35bef026c55be6a66e17b018fc5a395b422e0754d50d1af2351d88a042ca3feb78e280f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a021b7ce80ba0c20311f4ecc0bd3028035f1a1f2bd22ce4039570513b528ceed6288145cbb91b8a2a46ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea387fe0a0b021923cd410278fb47c8d6ad898cb09ba472c4e2308b1f3b67101",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdabfca24240284c28404371dbceb93753ec8f89046a6b029be845b74aa7230b5",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f599",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0a5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush32_1023_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush32_1023_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf599",
+                    "hash" : "0x68229478f1a8a6f5bb831cb7dbf2ae066dc9603aeed9a1dbc0147640cf5ae871",
+                    "mixHash" : "0xe8a709b3388c40bb468a021e6b9f7bd898e41c8b79b7eafe07dca9ee4fe52e8f",
+                    "nonce" : "0xb00673964ab88571",
+                    "number" : "0x01",
+                    "parentHash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
+                    "receiptTrie" : "0x51ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699acc",
+                    "stateRoot" : "0x7d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0bb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d404adef502eaa421651ae0780043bb9ba4b3b5c90793b675c37d03a7f3b2c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea051ae2f807f7601e3c39db2a9224f62b578be63a496f79b87ef5056b49e699accb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5998203e880a0e8a709b3388c40bb468a021e6b9f7bd898e41c8b79b7eafe07dca9ee4fe52e8f88b00673964ab88571f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xbb97b215bb43d81b9b71d8be1fa34181d3631fcb5ad1316aa097d889d5282a2d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x97a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097a866e2459d7a8dcf9925fb1bfe42cb54a157f1c48e45aa48577cb624b67222a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x68229478f1a8a6f5bb831cb7dbf2ae066dc9603aeed9a1dbc0147640cf5ae871",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1024_d0g0v0.json
index bb5a158b7..73b17123d 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1024_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush32_1024_d0g0v0_EIP150" : {
+    "stackLimitPush32_1024_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/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0xf31bb163e03b0aa38cbc7b8a018ceb9ec6780f2a2f2e08a59606a92479408167",
-                    "mixHash" : "0x7e7ff7b914ecd714ce31585948b113d49fd8c9d9b1ea3c2bc988229fb8023807",
-                    "nonce" : "0xf1cbca4dcbccfbb2",
+                    "hash" : "0x7db22765c492d9797744a14d99e664f0f116c8f3ef6a9c95076483e2251d28ba",
+                    "mixHash" : "0xd8e9e9ed0350d88002552493a6e23eb47f136b3cf0e84c04e2a3220483633ae4",
+                    "nonce" : "0xcaa6700c7bbaeec9",
                     "number" : "0x01",
                     "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
-                    "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
-                    "stateRoot" : "0x5bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7",
+                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
+                    "stateRoot" : "0xa39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a07e7ff7b914ecd714ce31585948b113d49fd8c9d9b1ea3c2bc988229fb802380788f1cbca4dcbccfbb2f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0d8e9e9ed0350d88002552493a6e23eb47f136b3cf0e84c04e2a3220483633ae488caa6700c7bbaeec9f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf31bb163e03b0aa38cbc7b8a018ceb9ec6780f2a2f2e08a59606a92479408167",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7db22765c492d9797744a14d99e664f0f116c8f3ef6a9c95076483e2251d28ba",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush32_1024_d0g0v0_EIP158" : {
+    "stackLimitPush32_1024_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/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x4c51d5a42ca179f0b90c573492ed9b1537fa414cf69d75022fdab8ac160ee9f8",
-                    "mixHash" : "0x9641cff6fdc48259364352439a70321e8672cc18994d2ee84fd66bd77c5a3e06",
-                    "nonce" : "0xaca69e7733d4d11c",
+                    "hash" : "0xc228bce03fe3bce4c11cdbf7a7129be9c0444de79465837634bec1a7b019007f",
+                    "mixHash" : "0xb048324a424c38a116365863d5925c14bc5b027942add35dc591cfad22dd8358",
+                    "nonce" : "0x077bcbd7d0fd1811",
                     "number" : "0x01",
                     "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
-                    "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
-                    "stateRoot" : "0x5bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7",
+                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
+                    "stateRoot" : "0xa39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a09641cff6fdc48259364352439a70321e8672cc18994d2ee84fd66bd77c5a3e0688aca69e7733d4d11cf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0b048324a424c38a116365863d5925c14bc5b027942add35dc591cfad22dd835888077bcbd7d0fd1811f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c51d5a42ca179f0b90c573492ed9b1537fa414cf69d75022fdab8ac160ee9f8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc228bce03fe3bce4c11cdbf7a7129be9c0444de79465837634bec1a7b019007f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush32_1024_d0g0v0_Frontier" : {
+    "stackLimitPush32_1024_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/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0xf1a570176e5ad305de4f6a7dc540a1b8335bfdbc4b62ad2ee584cc2fbb2c0b7e",
-                    "mixHash" : "0x5158edb6d0206125e45a34d8b92db54c68b704ad274f5d8362a6ae3d8d6fbc37",
-                    "nonce" : "0xe32ef5061f6c1253",
+                    "hash" : "0x9781bd5f42b06fba525e8b48d10728475774aae709b6fa4e0d0f329e916c8720",
+                    "mixHash" : "0xc156b43547974d26d99eab7ac9ea63c20c861c89e7d184565aae7b1551d2ee2e",
+                    "nonce" : "0x51863f649e9c6f53",
                     "number" : "0x01",
                     "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
                     "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a05158edb6d0206125e45a34d8b92db54c68b704ad274f5d8362a6ae3d8d6fbc3788e32ef5061f6c1253f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0c156b43547974d26d99eab7ac9ea63c20c861c89e7d184565aae7b1551d2ee2e8851863f649e9c6f53f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1a570176e5ad305de4f6a7dc540a1b8335bfdbc4b62ad2ee584cc2fbb2c0b7e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9781bd5f42b06fba525e8b48d10728475774aae709b6fa4e0d0f329e916c8720",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush32_1024_d0g0v0_Homestead" : {
+    "stackLimitPush32_1024_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/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x193ab5eb4273fe524c0364f621a71053c15ce8d9f5e5a2d5fea5d06a25569007",
-                    "mixHash" : "0x6f1de340cf16e520d05dd914b33dd6b3c25b694cb75c4c664e4af58007a7b499",
-                    "nonce" : "0xcab6f930a38e8a41",
+                    "hash" : "0x28556a4cab95d36cbae8232b3de4b03ff481d9673cc1a9b3b29e6284cbeb8f7c",
+                    "mixHash" : "0x3478a19d860aaba8584199163f74898a5153bb64968fc621c2852d2b2268d9a1",
+                    "nonce" : "0x2957035470852dbc",
                     "number" : "0x01",
                     "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
                     "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a06f1de340cf16e520d05dd914b33dd6b3c25b694cb75c4c664e4af58007a7b49988cab6f930a38e8a41f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a03478a19d860aaba8584199163f74898a5153bb64968fc621c2852d2b2268d9a1882957035470852dbcf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x193ab5eb4273fe524c0364f621a71053c15ce8d9f5e5a2d5fea5d06a25569007",
-        "network" : "Homestead",
+        "lastblockhash" : "0x28556a4cab95d36cbae8232b3de4b03ff481d9673cc1a9b3b29e6284cbeb8f7c",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush32_1024_d0g0v0_Metropolis" : {
+    "stackLimitPush32_1024_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/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0xf5c2",
-                    "hash" : "0x51ceb3bbac70c3555eec0ddc028b13451d4ea2a5e82afa8b36b8d67605799a13",
-                    "mixHash" : "0x41b7faaec6a7eccd2d2c91435588851e9ffb87e6aca21855dc0da6a40344af39",
-                    "nonce" : "0x4039419ad774fc83",
+                    "hash" : "0x182cdfb46f169104af972b0889f028cf2850c85526dd5471328401e6c4dacd81",
+                    "mixHash" : "0xded0d168e90def21fdd489508a4dfb550a8de8dfdcefec3025b4d0c4c23f595c",
+                    "nonce" : "0x734bcdebc6295ed6",
                     "number" : "0x01",
                     "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
-                    "receiptTrie" : "0x07d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479",
-                    "stateRoot" : "0xa39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2",
+                    "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
+                    "stateRoot" : "0x5bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a39bd48e2ebd3858e9ce777eee384a3ec06bbd25d186a545f9db7b3f7321a3d2a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea007d40fa4ca040182b2a60b84ca44f15e440203bad66bb2d0b732098b8ad27479b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a041b7faaec6a7eccd2d2c91435588851e9ffb87e6aca21855dc0da6a40344af39884039419ad774fc83f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0ded0d168e90def21fdd489508a4dfb550a8de8dfdcefec3025b4d0c4c23f595c88734bcdebc6295ed6f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51ceb3bbac70c3555eec0ddc028b13451d4ea2a5e82afa8b36b8d67605799a13",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x182cdfb46f169104af972b0889f028cf2850c85526dd5471328401e6c4dacd81",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f5c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff0a34",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush32_1024_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush32_1024_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xf5c2",
+                    "hash" : "0x37ff498e9ea85e32de07138b8ca378f3b532ba5c45c0ebe5cb8faece83a8bf59",
+                    "mixHash" : "0x770e9b9ac06545aacbafceafa2aff9d4a27b3814f69440a5345f2594333b9010",
+                    "nonce" : "0x5dcff22c6277cb58",
+                    "number" : "0x01",
+                    "parentHash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
+                    "receiptTrie" : "0xe959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447",
+                    "stateRoot" : "0x5bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a01e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bdf7ef255ed597b0d1fb1d080e6e3455081453f11f690aa46d1c4fb121870c7a0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0e959055d386f9d6f12edb53f58c37cad6f8d78049c43092d8d622089dc3a4447b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082f5c28203e880a0770e9b9ac06545aacbafceafa2aff9d4a27b3814f69440a5345f2594333b9010885dcff22c6277cb58f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x1e19106fea8817947a1237fa22d1cfa91d4ffcec36220a83bdb253f85ac7fa5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aab60b154ab2b0d554b8623c4e5ca27a285ecbac810ab73eaeb195945b7fd270a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x37ff498e9ea85e32de07138b8ca378f3b532ba5c45c0ebe5cb8faece83a8bf59",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1025_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1025_d0g0v0.json
index 08b3ce2bd..9432a2e00 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1025_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/stackLimitPush32_1025_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "stackLimitPush32_1025_d0g0v0_EIP150" : {
+    "stackLimitPush32_1025_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/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xc24dc638009eafb9e4f16195b460758b93c8c25e83ff3b4371308a94f67a5511",
-                    "mixHash" : "0xf3223f62e121d5e33457425e0ac74b009b0ddccb3bfda5fa23bdc3b5eac4618e",
-                    "nonce" : "0x7cd3e351e3094a37",
+                    "hash" : "0xb8f8b7fc0b860367fd9fdb913d33d101c187e141b6ff238687224c5063a53ac3",
+                    "mixHash" : "0x6aa563132cec46fc55a4759cba5952b5474715ede91b2b93d86d662664625337",
+                    "nonce" : "0x0054ae698ad38a5a",
                     "number" : "0x01",
                     "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
-                    "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
-                    "stateRoot" : "0x38d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167f",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x2522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0db",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0f3223f62e121d5e33457425e0ac74b009b0ddccb3bfda5fa23bdc3b5eac4618e887cd3e351e3094a37f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0dba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a06aa563132cec46fc55a4759cba5952b5474715ede91b2b93d86d662664625337880054ae698ad38a5af862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc24dc638009eafb9e4f16195b460758b93c8c25e83ff3b4371308a94f67a5511",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb8f8b7fc0b860367fd9fdb913d33d101c187e141b6ff238687224c5063a53ac3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "stackLimitPush32_1025_d0g0v0_EIP158" : {
+    "stackLimitPush32_1025_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/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x170dd4c8414095ed5f1e951f4601061277f1f223f33ea3b5262818fa77f07937",
-                    "mixHash" : "0xa89ec61cea4edc093327fa8089167e015228e665bb14a81eb5a82fd769e8ffb9",
-                    "nonce" : "0x69054c0718840c87",
+                    "hash" : "0xf9ef2155347ffe375aaf73ba1a119fc37bbabbbcbbdb8799bf26f363b2144a82",
+                    "mixHash" : "0xfc0f1a940a5aee1262be584ac4bfe420501a6b949e88fd386017340eed534ba3",
+                    "nonce" : "0xe8648ffd69bbb004",
                     "number" : "0x01",
                     "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
-                    "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
-                    "stateRoot" : "0x38d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167f",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0x2522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0db",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0a89ec61cea4edc093327fa8089167e015228e665bb14a81eb5a82fd769e8ffb98869054c0718840c87f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0dba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0fc0f1a940a5aee1262be584ac4bfe420501a6b949e88fd386017340eed534ba388e8648ffd69bbb004f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x170dd4c8414095ed5f1e951f4601061277f1f223f33ea3b5262818fa77f07937",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf9ef2155347ffe375aaf73ba1a119fc37bbabbbcbbdb8799bf26f363b2144a82",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "stackLimitPush32_1025_d0g0v0_Frontier" : {
+    "stackLimitPush32_1025_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/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xfdf5b6b131e50c74816c05acc799129185e7f84ecf9bd6292098498f2783412f",
-                    "mixHash" : "0x262dbce95ed1d844111904196e5144cd62a2a2b273b27df762938329a369d87b",
-                    "nonce" : "0x1298879340ec70e4",
+                    "hash" : "0x8c84effae2165a65b0da0f6d0c5e0c29c20c0200eec86cdb30c76b263b5dbae4",
+                    "mixHash" : "0x6bac66a9659ec87335b57715a7de61505ff40c6786de681dd941057792ccf365",
+                    "nonce" : "0x1ee72ba354814c66",
                     "number" : "0x01",
                     "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
                     "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0262dbce95ed1d844111904196e5144cd62a2a2b273b27df762938329a369d87b881298879340ec70e4f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a06bac66a9659ec87335b57715a7de61505ff40c6786de681dd941057792ccf365881ee72ba354814c66f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdf5b6b131e50c74816c05acc799129185e7f84ecf9bd6292098498f2783412f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8c84effae2165a65b0da0f6d0c5e0c29c20c0200eec86cdb30c76b263b5dbae4",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "stackLimitPush32_1025_d0g0v0_Homestead" : {
+    "stackLimitPush32_1025_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/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x18a2c48b1c4854ecc21de0fc7cf0fc604f5a2c66a2508be97779249d6bc3ec8b",
-                    "mixHash" : "0xd4a1f1b7b74e5a300a03eebc97c30b86e7c7fc21c8539ef98155d491d54e0e1a",
-                    "nonce" : "0x196be6d0071d812c",
+                    "hash" : "0xfabb0dced3531b5c151d685daf3f3769df74d8411ef653f4d7450b9f21ecf026",
+                    "mixHash" : "0xd7ba1701c86d333f28f56d3f662360a010644c7f2343f8230fddd34c01212eda",
+                    "nonce" : "0x65756bc2d0e2807e",
                     "number" : "0x01",
                     "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
                     "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0d4a1f1b7b74e5a300a03eebc97c30b86e7c7fc21c8539ef98155d491d54e0e1a88196be6d0071d812cf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a0d7ba1701c86d333f28f56d3f662360a010644c7f2343f8230fddd34c01212eda8865756bc2d0e2807ef862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18a2c48b1c4854ecc21de0fc7cf0fc604f5a2c66a2508be97779249d6bc3ec8b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfabb0dced3531b5c151d685daf3f3769df74d8411ef653f4d7450b9f21ecf026",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "stackLimitPush32_1025_d0g0v0_Metropolis" : {
+    "stackLimitPush32_1025_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/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xf5400d2cad87e3d77f7f8614b784d4ba10dc3b75a19ca625a6f33fa4432b53df",
-                    "mixHash" : "0x8c8dfcaf494feac3c3cd152ac45f0fe51f05be977fc853c11330033f7b06bb3d",
-                    "nonce" : "0x9f2b7c311c8899e2",
+                    "hash" : "0x9d66465f558c5d290b71120bd4fd26cbcf270556e0fd8cbec88929f3efb3eb56",
+                    "mixHash" : "0x4f3a779e6a974d4826a5b0f26f3e07ec0542026f0c39bf4a7704ea23292461d9",
+                    "nonce" : "0xcb067b4ae4b61672",
                     "number" : "0x01",
                     "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
-                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
-                    "stateRoot" : "0x2522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0db",
+                    "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
+                    "stateRoot" : "0x38d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02522f745e13cca35b5d3ee1df6d8016335b099725550866285c15ce6f428e0dba0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a08c8dfcaf494feac3c3cd152ac45f0fe51f05be977fc853c11330033f7b06bb3d889f2b7c311c8899e2f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a04f3a779e6a974d4826a5b0f26f3e07ec0542026f0c39bf4a7704ea23292461d988cb067b4ae4b61672f862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5400d2cad87e3d77f7f8614b784d4ba10dc3b75a19ca625a6f33fa4432b53df",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9d66465f558c5d290b71120bd4fd26cbcf270556e0fd8cbec88929f3efb3eb56",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f586a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffe7960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "stackLimitPush32_1025_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/stackLimitPush32_1025_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0xe004c6636664e4cadf8a07ff6e9a5d3ce68ca3f125f324b0145ceff063e219f7",
+                    "mixHash" : "0x5a0a13c431a510989a7bdef4bb7bcae11f0761e90747275b26ce4d20d15fb097",
+                    "nonce" : "0x1d318773039f5dba",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
+                    "receiptTrie" : "0x26556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0a",
+                    "stateRoot" : "0x38d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901faa07e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038d9f7d7f2fd049f47a7c4f46f3a620cf6e44d5b7af25036519abf5979ad167fa0ddb8defea6c1610afd06dda64253cb99ad91fcdbcd096618c99bbf1d4b43e7cea026556cbc49a5e4357f32cf50601987d335c5fdb03e4b3706b3fb9066ad8b8c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830186a08203e880a05a0a13c431a510989a7bdef4bb7bcae11f0761e90747275b26ce4d20d15fb097881d318773039f5dbaf862f8608001830186a0940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0b054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205ba05a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb054e6af901451cf834679b4c625bc4453057b43c728b7632a5ec533ed1f205b",
+                        "s" : "0x5a8090300acb5cae0f1c1f1208e60b0b6aad49e2951d0725e65cc3663bd6811c",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e05618f7e4b0b6c62b6055d7736bdb1386739c4a878b5b4f4e061e66a343195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b08144856f03a63c69b2fc34668725b72678a183190edbc38ea94e5ec17f1c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe004c6636664e4cadf8a07ff6e9a5d3ce68ca3f125f324b0145ceff063e219f7",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",